summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-04 20:36:47 +0000
committerGerrit Code Review <review@openstack.org>2012-01-04 20:36:47 +0000
commit4df633d42072906aad3dfcaf60801dcb04d1e540 (patch)
treea0358e13ad483796e71f90c6fd7ea862e8269b70
parent5a80b9d44d3155e1229c15a97b9bfe9d99a83117 (diff)
parentde8cf3a8492b7d9e75da8b54973e7d97fe3384bd (diff)
downloadnova-4df633d42072906aad3dfcaf60801dcb04d1e540.tar.gz
nova-4df633d42072906aad3dfcaf60801dcb04d1e540.tar.xz
nova-4df633d42072906aad3dfcaf60801dcb04d1e540.zip
Merge "Make quantum_use_dhcp falsifiable"
-rw-r--r--nova/network/quantum/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py
index 89bbb2f0d..36559fa45 100644
--- a/nova/network/quantum/manager.py
+++ b/nova/network/quantum/manager.py
@@ -46,7 +46,7 @@ flags.DEFINE_bool('use_melange_mac_generation', False,
"Use Melange for assignment of MAC addresses")
-flags.DEFINE_string('quantum_use_dhcp', 'False',
+flags.DEFINE_bool('quantum_use_dhcp', False,
'Whether or not to enable DHCP for networks')