updated to work w/ changes after merged trunk fixing var renaming. the logic which forces default to FLAGS.network_size if requested cidr was larger, was also applying to requested cidrs smaller than FLAGS.network_size. Requested cidrs smaller than FLAGS.network_size should be ignored and not overriden.

1 files changed, 6 insertions, 3 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 78cc96818..f53021581 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -695,15 +695,18 @@ class NetworkCommands(object):
         if not num_networks:
             num_networks = FLAGS.num_networks
         if not network_size:
-            network_size = FLAGS.network_size
-            fixnet = netaddr.IPNetwork(fixed_range)
+            #network_size = FLAGS.network_size
+            fixnet = netaddr.IPNetwork(fixed_range_v4)
             each_subnet_size = fixnet.size / int(num_networks)
-            if each_subnet_size > network_size:
+            if each_subnet_size > FLAGS.network_size:
+                network_size = FLAGS.network_size
                 subnet = 32 - int(math.log(network_size, 2))
                 oversize_msg = _('Subnet(s) too large, defaulting to /%s.'
                                  '  To override, specify network_size flag.'
                                 ) % subnet
                 print oversize_msg
+            else:
+                network_size = fixnet.size
         if not multi_host:
             multi_host = FLAGS.multi_host
         else: