summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-08-23 10:21:07 -0400
committerDan Prince <dan.prince@rackspace.com>2011-08-23 10:21:07 -0400
commit909e0ea5c61ba66e5c07b91ff225d64adf60f960 (patch)
tree4851e05ebfd1566cc6838cad9741be1a0fefcdc3
parent787913ddedce4f3395b4e3d5073a0eea259ed9f7 (diff)
downloadnova-909e0ea5c61ba66e5c07b91ff225d64adf60f960.tar.gz
nova-909e0ea5c61ba66e5c07b91ff225d64adf60f960.tar.xz
nova-909e0ea5c61ba66e5c07b91ff225d64adf60f960.zip
Move use_ipv6 into flags. Its used in multiple places (network manager and the OSAPI) and should be defined at the top level.
-rw-r--r--nova/flags.py2
-rw-r--r--nova/network/manager.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 48d5e8168..f822ae61a 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -402,3 +402,5 @@ DEFINE_bool('resume_guests_state_on_host_boot', False,
DEFINE_string('root_helper', 'sudo',
'Command prefix to use for running commands as root')
+
+DEFINE_bool('use_ipv6', False, 'use the ipv6')
diff --git a/nova/network/manager.py b/nova/network/manager.py
index aa2a3700c..404a3180e 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -106,8 +106,6 @@ flags.DEFINE_integer('create_unique_mac_address_attempts', 5,
'Number of attempts to create unique mac address')
flags.DEFINE_bool('auto_assign_floating_ip', False,
'Autoassigning floating ip to VM')
-flags.DEFINE_bool('use_ipv6', False,
- 'use the ipv6')
flags.DEFINE_string('network_host', socket.gethostname(),
'Network host to use for ip allocation in flat modes')
flags.DEFINE_bool('fake_call', False,