diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-23 17:05:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-23 17:05:40 +0000 |
| commit | 563ed09b9a35e50e24ca10c9a588df119e9a7725 (patch) | |
| tree | c451025db49f3db7799c0d3af98c13e4d2cbf156 | |
| parent | 1af6e20064a6f88def384d7030ba980431d1b990 (diff) | |
| parent | 0743313b521e3a7f2528d774ecf117ce03ec60d5 (diff) | |
Merge "Make it clear subnet_bits is unused in ipam case"
| -rw-r--r-- | nova/network/manager.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 9463562f8..2bb3baabb 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1342,14 +1342,13 @@ class NetworkManager(manager.SchedulerDependentManager): subnets_v4 = [] subnets_v6 = [] - subnet_bits = int(math.ceil(math.log(network_size, 2))) - if kwargs.get('ipam'): if cidr_v6: subnets_v6 = [netaddr.IPNetwork(cidr_v6)] if cidr: subnets_v4 = [netaddr.IPNetwork(cidr)] else: + subnet_bits = int(math.ceil(math.log(network_size, 2))) if cidr_v6: fixed_net_v6 = netaddr.IPNetwork(cidr_v6) prefixlen_v6 = 128 - subnet_bits |