From a300a964cedd44dec09dae3e631d0d11f5782213 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Wed, 27 Jul 2011 13:34:45 -0500 Subject: updated the bridge arg requirements based on manager --- bin/nova-manage | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index c1a5d8c5f..09a65fc02 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -667,16 +667,16 @@ class NetworkCommands(object): bridge = bridge or FLAGS.flat_network_bridge if not bridge: - raise exception.NetworkNotCreated(req='bridge') - #TODO(tr3buchet) flat_network_bridge FLAG needs to go away - # or be renamed to bridge + bridge_required = ['nova.network.manager.FlatManager', + 'nova.network.manager.FlatDHCPManager'] + if FLAGS.network_manager in bridge_required: + raise exception.NetworkNotCreated(req='bridge') bridge_interface = bridge_interface or FLAGS.flat_interface or \ FLAGS.vlan_interface if not bridge_interface: interface_required = ['nova.network.manager.FlatDHCPManager', 'nova.network.manager.VlanManager'] - # ensure that bridge interface is set if certain managers are used if FLAGS.network_manager in interface_required: raise exception.NetworkNotCreated(req='bridge interface') -- cgit