summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJason Koelker <jason@koelker.net>2011-07-21 15:26:48 -0500
committerJason Koelker <jason@koelker.net>2011-07-21 15:26:48 -0500
commit419b928ea2eb71fdcda66b4c83717120309ff36a (patch)
tree5fa2414d313ad490e92e423222ea50b0081e4370 /bin
parentd04b90ef23bd2e02e762ed22bce8729a2c619cf6 (diff)
downloadnova-419b928ea2eb71fdcda66b4c83717120309ff36a.tar.gz
nova-419b928ea2eb71fdcda66b4c83717120309ff36a.tar.xz
nova-419b928ea2eb71fdcda66b4c83717120309ff36a.zip
only use the flag if it evaluates true
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-manage2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 11d254597..c5ea30fcd 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -607,7 +607,7 @@ class NetworkCommands(object):
bridge_interface = FLAGS.flat_interface or FLAGS.vlan_interface
if not gateway_v6:
gateway_v6 = FLAGS.gateway_v6
- if not dns:
+ if not dns and FLAGS.flat_network_dns:
dns = FLAGS.flat_network_dns
net_manager = utils.import_object(FLAGS.network_manager)