--bridge defaults to br100 but with a deprecation warning and to be removed in d4

1 files changed, 10 insertions, 1 deletions

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