From 39ce4032bb62bf62e84b9a4191e16a28e4a68454 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 8 Jan 2013 07:20:09 +0000 Subject: Move manager options into nova.service Move the compute_manager, console_manager, cert_manager, network_manager and scheduler_manager options into nova.service. Apart from the tests, these options are mostly just used in nova.service so it makes sense for them to live there. Also, metadata_manager already lives there. blueprint: scope-config-opts Change-Id: I180859817b57c081b83d6a6f075a6ff76bb0ef6d --- bin/nova-dhcpbridge | 2 +- bin/nova-manage | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 66f6ba6a3..582edde99 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -48,7 +48,7 @@ from nova import utils CONF = cfg.CONF CONF.import_opt('host', 'nova.config') -CONF.import_opt('network_manager', 'nova.config') +CONF.import_opt('network_manager', 'nova.service') LOG = logging.getLogger('nova.dhcpbridge') diff --git a/bin/nova-manage b/bin/nova-manage index ba484a04e..3eb3b689c 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -90,7 +90,7 @@ from nova import utils from nova import version CONF = cfg.CONF -CONF.import_opt('network_manager', 'nova.config') +CONF.import_opt('network_manager', 'nova.service') CONF.import_opt('service_down_time', 'nova.config') CONF.import_opt('flat_network_bridge', 'nova.network.manager') CONF.import_opt('num_networks', 'nova.network.manager') -- cgit