diff options
| author | Jason Koelker <jason@koelker.net> | 2011-08-12 12:11:13 -0500 |
|---|---|---|
| committer | Jason Koelker <jason@koelker.net> | 2011-08-12 12:11:13 -0500 |
| commit | 07aae460e848af51667537d56ec8b89d0c79f048 (patch) | |
| tree | d3dc32bcd0f8098338334131e2e956196173927b | |
| parent | 0beef1b24ee63f554f5478d54ee32f86fe5f4f2c (diff) | |
only run if the subnet and cidr exist
| -rw-r--r-- | nova/network/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 889e1f9cd..f26263f2e 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -652,14 +652,14 @@ class NetworkManager(manager.SchedulerDependentManager): else: net['label'] = label - if cidr: + if cidr and subnet_v4: net['cidr'] = str(subnet_v4) net['netmask'] = str(subnet_v4.netmask) net['gateway'] = str(subnet_v4[1]) net['broadcast'] = str(subnet_v4.broadcast) net['dhcp_start'] = str(subnet_v4[2]) - if cidr_v6: + if cidr_v6 and subnet_v6: net['cidr_v6'] = str(subnet_v6) if gateway_v6: # use a pre-defined gateway if one is provided |
