diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 07:20:09 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-09 08:15:42 +0000 |
| commit | 39ce4032bb62bf62e84b9a4191e16a28e4a68454 (patch) | |
| tree | 53f5c61aea60d9f7942cdc1433a486d26547a217 /bin | |
| parent | eac6e73223658595737ea001e1e0b18cfb4398c1 (diff) | |
| download | nova-39ce4032bb62bf62e84b9a4191e16a28e4a68454.tar.gz nova-39ce4032bb62bf62e84b9a4191e16a28e4a68454.tar.xz nova-39ce4032bb62bf62e84b9a4191e16a28e4a68454.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-dhcpbridge | 2 | ||||
| -rwxr-xr-x | bin/nova-manage | 2 |
2 files changed, 2 insertions, 2 deletions
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') |