summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-26 23:01:18 +0000
committerGerrit Code Review <review@openstack.org>2012-10-26 23:01:18 +0000
commitdba6cc81fb4081773fb1c3daaba57425b21d60bb (patch)
tree7425fff49944e501382e3a7347d67596582901cf
parenta2a0e85312f43b9eccce084d68f17c511ab71022 (diff)
parent8a196b2ec7221ee3e7cd189da18d6630699ddc94 (diff)
downloadnova-dba6cc81fb4081773fb1c3daaba57425b21d60bb.tar.gz
nova-dba6cc81fb4081773fb1c3daaba57425b21d60bb.tar.xz
nova-dba6cc81fb4081773fb1c3daaba57425b21d60bb.zip
Merge "Extend IPv6 subnets to /64 if network_size is set smaller than /64"
-rw-r--r--nova/network/manager.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 4e20be5a4..a0a74bcfe 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -1509,6 +1509,9 @@ class NetworkManager(manager.SchedulerDependentManager):
if cidr_v6:
fixed_net_v6 = netaddr.IPNetwork(cidr_v6)
prefixlen_v6 = 128 - subnet_bits
+ # smallest subnet in IPv6 ethernet network is /64
+ if prefixlen_v6 > 64:
+ prefixlen_v6 = 64
subnets_v6 = fixed_net_v6.subnet(prefixlen_v6,
count=num_networks)
if cidr: