diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-05 06:53:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-05 06:53:22 +0000 |
| commit | d150f8a799cce1ced542375987d040f643f86344 (patch) | |
| tree | 32e51f7c01a1068af0e35d478db5f11c78b27b23 | |
| parent | ac78bc7596a43de9a0c59a3dfc89faa08805d099 (diff) | |
| parent | 7b530ce65bc543a2d042570d45eec3fe9441261f (diff) | |
| download | nova-d150f8a799cce1ced542375987d040f643f86344.tar.gz nova-d150f8a799cce1ced542375987d040f643f86344.tar.xz nova-d150f8a799cce1ced542375987d040f643f86344.zip | |
Merge "Move fake_network opt to nova.network.manager"
| -rw-r--r-- | nova/config.py | 7 | ||||
| -rw-r--r-- | nova/network/linux_net.py | 2 | ||||
| -rw-r--r-- | nova/network/manager.py | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/nova/config.py b/nova/config.py index c1204892e..2cc153203 100644 --- a/nova/config.py +++ b/nova/config.py @@ -56,14 +56,7 @@ core_opts = [ help="Top-level directory for maintaining nova's state"), ] -debug_opts = [ - cfg.BoolOpt('fake_network', - default=False, - help='If passed, use fake network devices and addresses'), -] - cfg.CONF.register_cli_opts(core_opts) -cfg.CONF.register_cli_opts(debug_opts) global_opts = [ cfg.StrOpt('my_ip', diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index a1c03bc51..e803488d2 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -95,7 +95,7 @@ linux_net_opts = [ CONF = cfg.CONF CONF.register_opts(linux_net_opts) CONF.import_opt('bindir', 'nova.config') -CONF.import_opt('fake_network', 'nova.config') +CONF.import_opt('fake_network', 'nova.network.manager') CONF.import_opt('host', 'nova.config') CONF.import_opt('use_ipv6', 'nova.config') CONF.import_opt('my_ip', 'nova.config') diff --git a/nova/network/manager.py b/nova/network/manager.py index 3c892cd56..bc7502348 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -150,6 +150,9 @@ network_opts = [ cfg.StrOpt('network_host', default=socket.getfqdn(), help='Network host to use for ip allocation in flat modes'), + cfg.BoolOpt('fake_network', + default=False, + help='If passed, use fake network devices and addresses'), cfg.BoolOpt('fake_call', default=False, help='If True, skip using the queue and make local calls'), @@ -193,7 +196,6 @@ network_opts = [ CONF = cfg.CONF CONF.register_opts(network_opts) -CONF.import_opt('fake_network', 'nova.config') CONF.import_opt('use_ipv6', 'nova.config') CONF.import_opt('my_ip', 'nova.config') |