From 92f82f620182eab0d5e6dffc8629ec0e25c52303 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Wed, 27 Jul 2011 14:35:39 -0500
Subject: oops! moved ipv6 block back into the for loop in network manager
 create_networks

---
 nova/network/manager.py | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/nova/network/manager.py b/nova/network/manager.py
index dbcc76771..34b26d728 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -613,31 +613,13 @@ class NetworkManager(manager.SchedulerDependentManager):
                         network_size, cidr_v6, gateway_v6, bridge,
                         bridge_interface, dns1=None, dns2=None, **kwargs):
         """Create networks based on parameters."""
-        net_v6 = {}
-        if FLAGS.use_ipv6:
-            project_net_v6 = netaddr.IPNetwork(cidr_v6)
-            significant_bits_v6 = 64
-            network_size_v6 = 1 << 64
-            start_v6 = index * network_size_v6
-            cidr_v6 = '%s/%s' % (project_net_v6[start_v6],
-                                 significant_bits_v6)
-            net_v6['cidr_v6'] = cidr_v6
-
-            if gateway_v6:
-                # use a pre-defined gateway if one is provided
-                net_v6['gateway_v6'] = str(gateway_v6)
-            else:
-                net_v6['gateway_v6'] = str(project_net_v6[1])
-
-            net_v6['netmask_v6'] = str(project_net_v6._prefixlen)
-
         fixed_net = netaddr.IPNetwork(cidr)
         for index in range(num_networks):
             start = index * network_size
             significant_bits = 32 - int(math.log(network_size, 2))
             cidr = '%s/%s' % (fixed_net[start], significant_bits)
             project_net = netaddr.IPNetwork(cidr)
-            net = dict(net_v6)
+            net = {}
             net['bridge'] = bridge
             net['bridge_interface'] = bridge_interface
             net['dns1'] = dns1
@@ -653,6 +635,23 @@ class NetworkManager(manager.SchedulerDependentManager):
             else:
                 net['label'] = label
 
+            if FLAGS.use_ipv6:
+                project_net_v6 = netaddr.IPNetwork(cidr_v6)
+                significant_bits_v6 = 64
+                network_size_v6 = 1 << 64
+                start_v6 = index * network_size_v6
+                cidr_v6 = '%s/%s' % (project_net_v6[start_v6],
+                                     significant_bits_v6)
+                net['cidr_v6'] = cidr_v6
+
+                if gateway_v6:
+                    # use a pre-defined gateway if one is provided
+                    net['gateway_v6'] = str(gateway_v6)
+                else:
+                    net['gateway_v6'] = str(project_net_v6[1])
+
+                net['netmask_v6'] = str(project_net_v6._prefixlen)
+
             if kwargs.get('vpn', False):
                 # this bit here is for vlan-manager
                 del net['dns1']
-- 
cgit