summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-31 15:29:24 -0500
committerTodd Willey <todd@ansolabs.com>2011-01-31 15:29:24 -0500
commit7ee26753b06dcf49867796fcadfa6f430bc46578 (patch)
treeae0aba87f7032e7fec100e6c8b860f47891a75f2 /bin
parentece7d2fa493e901c2a826e42a86ca93bb0afaed4 (diff)
parent1cd4dfe34acaec06c96925c7903a9d8dc25fe34f (diff)
Merge trunk and make work with provider fw rules (setup alongside basic_rules).
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-manage4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 1b70ebf17..7835ca551 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -495,9 +495,9 @@ class NetworkCommands(object):
cidr=fixed_range,
num_networks=int(num_networks),
network_size=int(network_size),
+ cidr_v6=fixed_range_v6,
vlan_start=int(vlan_start),
- vpn_start=int(vpn_start),
- cidr_v6=fixed_range_v6)
+ vpn_start=int(vpn_start))
class ServiceCommands(object):