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

cloudstack: extend support for VPC (#18434)

Browse source
This commit is contained in:
René Moser 2016-11-14 09:03:46 +01:00 • committed by GitHub
parent 534bd12ae9
commit b08ef44da0
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/ansible/module_utils/cloudstack.py
View file

@ -248,10 +248,11 @@ class AnsibleCloudStack(object):
return None return None
args = { args = {
'account': self.get_account('name'), 'account': self.get_account(key='name'),
'domainid': self.get_domain('id'), 'domainid': self.get_domain(key='id'),
'projectid': self.get_project('id'), 'projectid': self.get_project(key='id'),
'zoneid': self.get_zone('id'), 'zoneid': self.get_zone(key='id'),
'vpcid': self.get_vpc(key='id')
} }
networks = self.cs.listNetworks(**args) networks = self.cs.listNetworks(**args)
if not networks: if not networks:
@ -293,11 +294,13 @@ class AnsibleCloudStack(object):
if not ip_address: if not ip_address:
self.module.fail_json(msg="IP address param 'ip_address' is required") self.module.fail_json(msg="IP address param 'ip_address' is required")
args = {} args = {
args['ipaddress'] = ip_address 'ipaddress': ip_address,
args['account'] = self.get_account(key='name') 'account': self.get_account(key='name'),
args['domainid'] = self.get_domain(key='id') 'domainid': self.get_domain(key='id'),
args['projectid'] = self.get_project(key='id') 'projectid': self.get_project(key='id'),
'vpcid': self.get_vpc(key='id'),
}
ip_addresses = self.cs.listPublicIpAddresses(**args) ip_addresses = self.cs.listPublicIpAddresses(**args)
if not ip_addresses: if not ip_addresses:
@ -341,11 +344,13 @@ class AnsibleCloudStack(object):
if not vm: if not vm:
self.module.fail_json(msg="Virtual machine param 'vm' is required") self.module.fail_json(msg="Virtual machine param 'vm' is required")
args = {} args = {
args['account'] = self.get_account(key='name') 'account': self.get_account(key='name'),
args['domainid'] = self.get_domain(key='id') 'domainid': self.get_domain(key='id'),
args['projectid'] = self.get_project(key='id') 'projectid': self.get_project(key='id'),
args['zoneid'] = self.get_zone(key='id') 'zoneid': self.get_zone(key='id'),
'vpcid': self.get_vpc(key='id'),
}
vms = self.cs.listVirtualMachines(**args) vms = self.cs.listVirtualMachines(**args)
if vms: if vms:
for v in vms['virtualmachine']: for v in vms['virtualmachine']: