Merge lp:~berendt/nova/lp715180_fixing_state_of_bridge into lp:~hudson-openstack/nova/trunk

[Christian Berendt]

set state of a new created bridge to up for IPv4 and IPv6

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

This conflicts with my branch here: https://code.launchpad.net/~vishvananda/nova/lp710959/+merge/48341

I don't think this fix will be necessary once that branch is merged.

review: Disapprove

[Christian Berendt (berendt)]

Patch by vish should also fix the problem with the upcoming bridge. If I understand it correctly the patch by vish will be applied soon. So I don't see a problem to disapprove this merge and to close bug #715180 as a duplicate of bug #710959.

If the patch by vish will not be applied soon I think it's better apply this patch first to have a working bridge in the code base.

[Devin Carlen (devcamcar)]

Vish's patch is close to being merged in, so I'm going to reject this patch.

Unmerged revisions

655. By Christian Berendt on 2011-02-08

we want the newly created bridge to be up, even we're still using ipv4

=== modified file 'nova/network/linux_net.py'
--- nova/network/linux_net.py	2011-02-08 06:07:05 +0000
+++ nova/network/linux_net.py	2011-02-08 14:59:52 +0000
@@ -203,9 +203,9 @@
         if(FLAGS.use_ipv6):
             _execute("sudo ip -f inet6 addr change %s dev %s" %
                      (net_attrs['cidr_v6'], bridge))
-            _execute("sudo ip link set %s up" % bridge)
-    else:
-        _execute("sudo ip link set %s up" % bridge)
+
+    _execute("sudo ip link set %s up" % bridge)
+
     if FLAGS.use_nova_chains:
         (out, err) = _execute("sudo iptables -N nova_forward",
                               check_exit_code=False)