← Back to branch summary

~hudson-openstack/nova/trunk

« back to all changes in this revision

Viewing changes to bin/nova-manage

  • Committer: Tarmac
  • Author(s): Trey Morris
  • Date: 2011-09-20 06:38:04 UTC
  • mfrom: (1594.2.1 remove_warning)
  • Revision ID: tarmac-20110920063804-9a7xawkb8kxere4y
removes warning set forth in d3 for deprecated setting of bridge automagically

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/nova-manage
763
763
            bridge_required = ['nova.network.manager.FlatManager',
764
764
                               'nova.network.manager.FlatDHCPManager']
765
765
            if FLAGS.network_manager in bridge_required:
766
 
                # TODO(tr3buchet) - swap print statement and following line for
767
 
                #                   raise statement in diablo 4
768
 
                print _('--bridge parameter required or FLAG '
769
 
                        'flat_network_bridge must be set to create networks\n'
770
 
                        'WARNING! ACHTUNG! Setting the bridge to br100 '
771
 
                        'automatically is deprecated and will be removed in '
772
 
                        'Diablo milestone 4. Prepare yourself accordingly.')
773
 
                time.sleep(10)
774
 
                bridge = 'br100'
775
 
                #raise exception.NetworkNotCreated(req='--bridge')
 
766
                raise exception.NetworkNotCreated(req='--bridge')
776
767
 
777
768
        bridge_interface = bridge_interface or FLAGS.flat_interface or \
778
769
                           FLAGS.vlan_interface