From 7c9dc248af2e19abd04b342f53b1f93fe1547bba Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Wed, 27 Jul 2011 17:19:19 -0500 Subject: --bridge defaults to br100 but with a deprecation warning and to be removed in d4 --- bin/nova-manage | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/nova-manage b/bin/nova-manage index 76a3874cb..ef0ae0fbb 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -670,7 +670,16 @@ class NetworkCommands(object): bridge_required = ['nova.network.manager.FlatManager', 'nova.network.manager.FlatDHCPManager'] if FLAGS.network_manager in bridge_required: - raise exception.NetworkNotCreated(req='--bridge') + # TODO(tr3buchet) - swap print statement and following line for + # raise statement in diablo 4 + print _('--bridge parameter required or FLAG ' + 'flat_network_bridge must be set to create networks' + 'WARNING! ACHTUNG! Setting the bridge to br100 ' + 'automatically is deprecated and will be removed in ' + 'Diablo milestone 4') + time.sleep(10) + bridge = 'br100' + #raise exception.NetworkNotCreated(req='--bridge') bridge_interface = bridge_interface or FLAGS.flat_interface or \ FLAGS.vlan_interface -- cgit