diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-10 05:35:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-10 05:35:33 +0000 |
| commit | 7a0bed371ecbd7cc7026fee8b8148f48c7be82e9 (patch) | |
| tree | 0cf7580997e450e23525f0c69c7d00eafe5731c4 | |
| parent | 2d061617b2482c9bf26c279bb03178be95482d24 (diff) | |
| parent | d8c80c6b14c29dbea21ce045adce82ac92708fa3 (diff) | |
| download | nova-7a0bed371ecbd7cc7026fee8b8148f48c7be82e9.tar.gz nova-7a0bed371ecbd7cc7026fee8b8148f48c7be82e9.tar.xz nova-7a0bed371ecbd7cc7026fee8b8148f48c7be82e9.zip | |
Merge "Move service_down_time to nova.service"
| -rwxr-xr-x | bin/nova-manage | 2 | ||||
| -rw-r--r-- | nova/api/openstack/compute/contrib/services.py | 2 | ||||
| -rw-r--r-- | nova/config.py | 3 | ||||
| -rw-r--r-- | nova/service.py | 3 | ||||
| -rw-r--r-- | nova/servicegroup/db_driver.py | 2 | ||||
| -rw-r--r-- | nova/utils.py | 1 |
6 files changed, 7 insertions, 6 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 3fc132d49..62a6cdc3a 100755 --- a/bin/nova-manage +++ b/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') diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py index dad77e61b..c792c72da 100644 --- a/nova/api/openstack/compute/contrib/services.py +++ b/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): diff --git a/nova/config.py b/nova/config.py index 61152774b..81d636708 100644 --- a/nova/config.py +++ b/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) diff --git a/nova/service.py b/nova/service.py index 41eb254b5..17d7773dd 100644 --- a/nova/service.py +++ b/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 diff --git a/nova/servicegroup/db_driver.py b/nova/servicegroup/db_driver.py index 393943bdd..075db3ed8 100644 --- a/nova/servicegroup/db_driver.py +++ b/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__) diff --git a/nova/utils.py b/nova/utils.py index cbf01cab4..115791b64 100644 --- a/nova/utils.py +++ b/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__) |