diff options
| author | Adam Johnson <adjohn@gmail.com> | 2011-07-26 09:41:55 +0900 |
|---|---|---|
| committer | Adam Johnson <adjohn@gmail.com> | 2011-07-26 09:41:55 +0900 |
| commit | a9b10f32aeb9794e1c7ea80e1794d71876997cb1 (patch) | |
| tree | b0c727d73f369a3e168144a622d7e1cd7f89d41a /bin | |
| parent | 4c9ca0962e98c33b54d289c5ac1cd0dc79d36b51 (diff) | |
| parent | 83033f69e19832dc50fccf5b833189f0c4e8de63 (diff) | |
fixing merge conflict
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index b6029bb52..7477c213d 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -566,12 +566,14 @@ class NetworkCommands(object): def create(self, label=None, fixed_range=None, num_networks=None, 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): + flat_network_bridge=None, bridge_interface=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], [vpn_start=FLAG], [fixed_range_v6=FLAG], [gateway_v6=FLAG], [flat_network_bridge=FLAG], [bridge_interface=FLAG] + [dns1=FLAG], [dns2] If you wish to use a later argument fill in the gaps with ""s Ex: network create private 10.0.0.0/8 1 16 T "" "" "" "" xenbr1 eth1 network create private 10.0.0.0/8 1 16 @@ -605,6 +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 dns1 and FLAGS.flat_network_dns: + dns1 = FLAGS.flat_network_dns net_manager = utils.import_object(FLAGS.network_manager) try: @@ -619,24 +623,30 @@ class NetworkCommands(object): cidr_v6=fixed_range_v6, gateway_v6=gateway_v6, bridge=flat_network_bridge, - bridge_interface=bridge_interface) + bridge_interface=bridge_interface, + dns1=dns1, + dns2=dns2) except ValueError, e: print e raise e def list(self): """List all created networks""" - print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (_('network'), + print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % ( + _('network'), _('netmask'), _('start address'), - _('DNS'), + _('DNS1'), + _('DNS2'), _('VlanID'), 'project') for network in db.network_get_all(context.get_admin_context()): - print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (network.cidr, + print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % ( + network.cidr, network.netmask, network.dhcp_start, - network.dns, + network.dns1, + network.dns2, network.vlan, network.project_id) |