diff options
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 6 | ||||
| -rw-r--r-- | nova/compute/utils.py | 2 |
2 files changed, 3 insertions, 5 deletions
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__) |