diff options
author | Dan Prince <dan.prince@rackspace.com> | 2011-08-23 15:00:01 +0000 |
---|---|---|
committer | Tarmac <> | 2011-08-23 15:00:01 +0000 |
commit | e23eb5aa5c9810f68f3818cd1119e4993b99a297 (patch) | |
tree | ffe53beefd439a024b401851d075c6b3e86715c5 | |
parent | 787913ddedce4f3395b4e3d5073a0eea259ed9f7 (diff) | |
parent | e1c27761863a50bf33a2dcfffa96e911ae9b5b55 (diff) | |
download | nova-e23eb5aa5c9810f68f3818cd1119e4993b99a297.tar.gz nova-e23eb5aa5c9810f68f3818cd1119e4993b99a297.tar.xz nova-e23eb5aa5c9810f68f3818cd1119e4993b99a297.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.py | 2 | ||||
-rw-r--r-- | nova/network/manager.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py index 48d5e8168..ce5356723 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 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, |