From 7cb17d63f1bd317abc5cacd6d77e7ca810ccc346 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 8 Jan 2013 09:48:03 +0000 Subject: Move global service networking opts to new module The my_ip, host and use_ipv6 options are used all over the codebase and they're pretty well related to each other. Create a new netconf module for them to live in. There are now no options registered globally in nova.config! blueprint: scope-config-opts Change-Id: Ifde37839ae6f38e6bf99dff1e80b8e25fd68ed25 --- nova/compute/manager.py | 6 ++---- nova/compute/utils.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 682af2ce5..1628c026d 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -174,11 +174,9 @@ CONF.register_opts(timeout_opts) CONF.register_opts(running_deleted_opts) CONF.import_opt('allow_resize_to_same_host', 'nova.compute.api') CONF.import_opt('console_topic', 'nova.console.rpcapi') -CONF.import_opt('host', 'nova.config') -CONF.import_opt('my_ip', 'nova.config') +CONF.import_opt('host', 'nova.netconf') +CONF.import_opt('my_ip', 'nova.netconf') CONF.import_opt('network_manager', 'nova.service') -CONF.import_opt('reclaim_instance_interval', 'nova.config') -CONF.import_opt('my_ip', 'nova.config') QUOTAS = quota.QUOTAS diff --git a/nova/compute/utils.py b/nova/compute/utils.py index 6d6b7cac9..e8592dbe2 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -33,7 +33,7 @@ from nova import utils from nova.virt import driver CONF = cfg.CONF -CONF.import_opt('host', 'nova.config') +CONF.import_opt('host', 'nova.netconf') LOG = log.getLogger(__name__) -- cgit