summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJason Koelker <jason@koelker.net>2011-07-22 16:47:37 -0500
committerJason Koelker <jason@koelker.net>2011-07-22 16:47:37 -0500
commite54f0cb05a3e10ad4234c672e2096da2a3eaa2da (patch)
tree19ac7d9048ce6267f53899b812ad24c085345c8f /bin
parentf3ddef7d541b31015117c35cb3aaa2fc15e1ccef (diff)
default to None in the method signature
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-manage12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index ece63e54d..e97596a54 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -567,7 +567,7 @@ class NetworkCommands(object):
network_size=None, multi_host=None, vlan_start=None,
vpn_start=None, fixed_range_v6=None, gateway_v6=None,
flat_network_bridge=None, bridge_interface=None,
- dns=None, dns2=None):
+ dns1=None, dns2=None):
"""Creates fixed ips for host by range
arguments: label, fixed_range, [num_networks=FLAG],
[network_size=FLAG], [multi_host=FLAG], [vlan_start=FLAG],
@@ -607,8 +607,8 @@ class NetworkCommands(object):
bridge_interface = FLAGS.flat_interface or FLAGS.vlan_interface
if not gateway_v6:
gateway_v6 = FLAGS.gateway_v6
- if not dns and FLAGS.flat_network_dns:
- dns = FLAGS.flat_network_dns
+ if not dns1 and FLAGS.flat_network_dns:
+ dns1 = FLAGS.flat_network_dns
net_manager = utils.import_object(FLAGS.network_manager)
try:
@@ -624,7 +624,7 @@ class NetworkCommands(object):
gateway_v6=gateway_v6,
bridge=flat_network_bridge,
bridge_interface=bridge_interface,
- dns=dns,
+ dns1=dns1,
dns2=dns2)
except ValueError, e:
print e
@@ -636,7 +636,7 @@ class NetworkCommands(object):
_('network'),
_('netmask'),
_('start address'),
- _('DNS'),
+ _('DNS1'),
_('DNS2'),
_('VlanID'),
'project')
@@ -645,7 +645,7 @@ class NetworkCommands(object):
network.cidr,
network.netmask,
network.dhcp_start,
- network.dns,
+ network.dns1,
network.dns2,
network.vlan,
network.project_id)