diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-09-20 09:22:25 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-09-20 09:22:25 -0400 |
| commit | 4ee5cab427a95d451a3f33e90d0d5f9d3879c12d (patch) | |
| tree | 39506b9e74d7bdc9d1d50d94465e4c498e5e0a15 /bin | |
| parent | f27ed550fae070c8cfeaf638b2a00a9b80f188c1 (diff) | |
| parent | 97602419375622006a20f81d0f83fd005c6816ac (diff) | |
merge from trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 4e9307273..1f4aa8a78 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -738,7 +738,7 @@ class NetworkCommands(object): help='Multi host') @args('--dns1', dest="dns1", metavar="<DNS Address>", help='First DNS') @args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS') - @args('--uuid', dest="net_uuid", metavar="<network uuid>", + @args('--uuid', dest="uuid", metavar="<network uuid>", help='Network UUID') @args('--project_id', dest="project_id", metavar="<project id>", help='Project id') @@ -763,16 +763,7 @@ class NetworkCommands(object): bridge_required = ['nova.network.manager.FlatManager', 'nova.network.manager.FlatDHCPManager'] if FLAGS.network_manager in bridge_required: - # 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\n' - 'WARNING! ACHTUNG! Setting the bridge to br100 ' - 'automatically is deprecated and will be removed in ' - 'Diablo milestone 4. Prepare yourself accordingly.') - time.sleep(10) - bridge = 'br100' - #raise exception.NetworkNotCreated(req='--bridge') + raise exception.NetworkNotCreated(req='--bridge') bridge_interface = bridge_interface or FLAGS.flat_interface or \ FLAGS.vlan_interface |