From eee411b90f7c6eda0de898489daff6e6aa006bb1 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 19 Sep 2011 15:56:42 -0500
Subject: now raising instead of setting bridge to br100 and warning as was
 noted

---
 bin/nova-manage | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 089b2eeae..4d90dd1b3 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -710,16 +710,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
-- 
cgit 


From 5a9c4ef3786d99373b1d3c16b499420425221ae0 Mon Sep 17 00:00:00 2001
From: "Brad McConnell bmcconne@rackspace.com" <>
Date: Mon, 19 Sep 2011 21:35:47 -0500
Subject: Fixed --uuid network command in nova-manage to desc to "uuid" instead
 of "net_uuid"

---
 bin/nova-manage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 4e9307273..8a1a8537d 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')
-- 
cgit