~hudson-openstack/nova/trunk

« back to all changes in this revision

Viewing changes to bin/nova-manage

  • Committer: Trey Morris
  • Date: 2011-09-19 20:56:42 UTC
  • mto: This revision was merged to the branch mainline in revision 1600.
  • Revision ID: trey.morris@rackspace.com-20110919205642-xly32itcwvo5bcha
now raising instead of setting bridge to br100 and warning as was noted

Show diffs side-by-side

added added

removed removed

Lines of Context:
710
710
            bridge_required = ['nova.network.manager.FlatManager',
711
711
                               'nova.network.manager.FlatDHCPManager']
712
712
            if FLAGS.network_manager in bridge_required:
713
 
                # TODO(tr3buchet) - swap print statement and following line for
714
 
                #                   raise statement in diablo 4
715
 
                print _('--bridge parameter required or FLAG '
716
 
                        'flat_network_bridge must be set to create networks\n'
717
 
                        'WARNING! ACHTUNG! Setting the bridge to br100 '
718
 
                        'automatically is deprecated and will be removed in '
719
 
                        'Diablo milestone 4. Prepare yourself accordingly.')
720
 
                time.sleep(10)
721
 
                bridge = 'br100'
722
 
                #raise exception.NetworkNotCreated(req='--bridge')
 
713
                raise exception.NetworkNotCreated(req='--bridge')
723
714
 
724
715
        bridge_interface = bridge_interface or FLAGS.flat_interface or \
725
716
                           FLAGS.vlan_interface