diff options
| author | Tracy Jones <tjones@vmware.com> | 2015-12-11 08:24:18 -0800 |
|---|---|---|
| committer | Daniel Berrange <berrange@redhat.com> | 2016-04-04 16:39:02 +0000 |
| commit | 185e00ee745c94bca191002c106600f5ebfcc99b (patch) | |
| tree | 4108692c0b94eab6f128a2ae668a5cf97d49e47b /nova/servicegroup | |
| parent | b35a1105bf7b275fd43377dd17db0ce56fbf0b7f (diff) | |
| download | nova-185e00ee745c94bca191002c106600f5ebfcc99b.tar.gz | |
config options: centralize section "service"
Move options from 'service' to 'conf/service.py'.
Change-Id: I621481590d93b806ea17d498a562da87207001f3
Co-Authored-By: Stephen Finucane <stephen.finucane@intel.com>
Implements: blueprint centralize-config-options-newton
Diffstat (limited to 'nova/servicegroup')
| -rw-r--r-- | nova/servicegroup/drivers/db.py | 5 | ||||
| -rw-r--r-- | nova/servicegroup/drivers/mc.py | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nova/servicegroup/drivers/db.py b/nova/servicegroup/drivers/db.py index d8f7d53a92..ff41ad0c4f 100644 --- a/nova/servicegroup/drivers/db.py +++ b/nova/servicegroup/drivers/db.py @@ -13,19 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo_config import cfg from oslo_log import log as logging import oslo_messaging as messaging from oslo_utils import timeutils import six +import nova.conf from nova.i18n import _, _LI, _LW, _LE from nova.servicegroup import api from nova.servicegroup.drivers import base -CONF = cfg.CONF -CONF.import_opt('service_down_time', 'nova.service') +CONF = nova.conf.CONF LOG = logging.getLogger(__name__) diff --git a/nova/servicegroup/drivers/mc.py b/nova/servicegroup/drivers/mc.py index 8b52a27fa7..9aa34cafe2 100644 --- a/nova/servicegroup/drivers/mc.py +++ b/nova/servicegroup/drivers/mc.py @@ -17,18 +17,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo_config import cfg from oslo_log import log as logging from oslo_utils import timeutils from nova import cache_utils +import nova.conf from nova.i18n import _, _LI, _LW from nova.servicegroup import api from nova.servicegroup.drivers import base -CONF = cfg.CONF -CONF.import_opt('service_down_time', 'nova.service') +CONF = nova.conf.CONF LOG = logging.getLogger(__name__) |