x/gantt
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Trey Morris
2011-07-27 17:19:19 -05:00
parent 27a9911f6e
commit af430f924b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/nova-manage
View File

@@ -670,7 +670,16 @@ class NetworkCommands(object):
bridge_required = ['nova.network.manager.FlatManager', bridge_required = ['nova.network.manager.FlatManager',
'nova.network.manager.FlatDHCPManager'] 'nova.network.manager.FlatDHCPManager']
if FLAGS.network_manager in bridge_required: 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 \ bridge_interface = bridge_interface or FLAGS.flat_interface or \
FLAGS.vlan_interface FLAGS.vlan_interface