cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename param to ip_to_networks

Browse source
This commit is contained in:
Darren Worrall 2015-08-11 15:33:20 +01:00
parent d11182b80b
commit ecfd18a941
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cloud/cloudstack/cs_instance.py
View file

@ -97,7 +97,7 @@ options:
- IPv6 address for default instance's network. - IPv6 address for default instance's network.
required: false required: false
default: null default: null
iptonetwork: ip_to_networks:
description: description:
- List of mappings in the form {'network': NetworkName, 'ip': 1.2.3.4} - List of mappings in the form {'network': NetworkName, 'ip': 1.2.3.4}
- Mutually exclusive with C(networks) option. - Mutually exclusive with C(networks) option.
@ -221,7 +221,7 @@ EXAMPLES = '''
name: web-vm-1 name: web-vm-1
template: Linux Debian 7 64-bit template: Linux Debian 7 64-bit
service_offering: Tiny service_offering: Tiny
iptonetwork: ip_to_networks:
- {'network': NetworkA, 'ip': '10.1.1.1'} - {'network': NetworkA, 'ip': '10.1.1.1'}
- {'network': NetworkB, 'ip': '192.168.1.1'} - {'network': NetworkB, 'ip': '192.168.1.1'}
@ -465,12 +465,12 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
return self.instance return self.instance
def get_iptonetwork_mappings(self): def get_iptonetwork_mappings(self):
network_mappings = self.module.params.get('iptonetwork') network_mappings = self.module.params.get('ip_to_networks')
if network_mappings is None: if network_mappings is None:
return return
if network_mappings and self.module.params.get('networks'): if network_mappings and self.module.params.get('networks'):
self.module.fail_json(msg="networks and iptonetwork are mutually exclusive.") self.module.fail_json(msg="networks and ip_to_networks are mutually exclusive.")
network_names = [n['network'] for n in network_mappings] network_names = [n['network'] for n in network_mappings]
ids = self.get_network_ids(network_names).split(',') ids = self.get_network_ids(network_names).split(',')
@ -818,7 +818,7 @@ def main():
template = dict(default=None), template = dict(default=None),
iso = dict(default=None), iso = dict(default=None),
networks = dict(type='list', aliases=[ 'network' ], default=None), networks = dict(type='list', aliases=[ 'network' ], default=None),
iptonetwork = dict(type='list', default=None), ip_to_networks = dict(type='list', default=None),
ip_address = dict(defaul=None), ip_address = dict(defaul=None),
ip6_address = dict(defaul=None), ip6_address = dict(defaul=None),
disk_offering = dict(default=None), disk_offering = dict(default=None),