Move service_down_time to nova.service

blueprint: scope-config-opts
Change-Id: I5fddb3768348c43a38b72dbf738b0c7fa2967691

bin/nova-manage

@@ -91,7 +91,7 @@ from nova import version
 
 CONF = cfg.CONF
 CONF.import_opt('network_manager', 'nova.service')
-CONF.import_opt('service_down_time', 'nova.config')
+CONF.import_opt('service_down_time', 'nova.service')
 CONF.import_opt('flat_network_bridge', 'nova.network.manager')
 CONF.import_opt('num_networks', 'nova.network.manager')
 CONF.import_opt('multi_host', 'nova.network.manager')

nova/api/openstack/compute/contrib/services.py

@@ -32,7 +32,7 @@ from nova import utils
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'services')
 CONF = cfg.CONF
-CONF.import_opt('service_down_time', 'nova.config')
+CONF.import_opt('service_down_time', 'nova.service')
 
 
 class ServicesIndexTemplate(xmlutil.TemplateBuilder):

nova/config.py

@@ -60,9 +60,6 @@ global_opts = [
     cfg.BoolOpt('use_ipv6',
                 default=False,
                 help='use ipv6'),
-    cfg.IntOpt('service_down_time',
-               default=60,
-               help='maximum time since last check-in for up service'),
 ]
 
 cfg.CONF.register_opts(global_opts)

nova/service.py

@@ -105,6 +105,9 @@ service_opts = [
     cfg.StrOpt('scheduler_manager',
                default='nova.scheduler.manager.SchedulerManager',
                help='full class name for the Manager for scheduler'),
+    cfg.IntOpt('service_down_time',
+               default=60,
+               help='maximum time since last check-in for up service'),
     ]
 
 CONF = cfg.CONF

nova/servicegroup/db_driver.py

@@ -25,6 +25,8 @@ from nova import utils
 
 
 CONF = cfg.CONF
+CONF.import_opt('service_down_time', 'nova.service')
+
 LOG = logging.getLogger(__name__)
 
 

nova/utils.py

@@ -80,7 +80,6 @@ utils_opts = [
 CONF = cfg.CONF
 CONF.register_opts(monkey_patch_opts)
 CONF.register_opts(utils_opts)
-CONF.import_opt('service_down_time', 'nova.config')
 
 LOG = logging.getLogger(__name__)