Merge "Handle missing network_size in nova-manage"

bhagemeier · Sep 11, 2012 · ca2d9a9 · ca2d9a9
2 parents 4ff3115 + 7483115
commit ca2d9a9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/nova/network/manager.py b/nova/network/manager.py
@@ -1371,11 +1371,12 @@ def create_networks(self, context,
                     "vlan_start", "vpn_start")
         for key in int_args:
             try:
-                kwargs[key] = int(kwargs[key])
+                value = kwargs.get(key)
+                if value is None:
+                    continue
+                kwargs[key] = int(value)
             except ValueError:
                 raise ValueError(_("%s must be an integer") % key)
-            except KeyError:
-                pass
 
         # check for certain required inputs
         label = kwargs["label"]