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

cloudstack: cs_staticnat: add vpc support (#2285)

Browse source 
* cloudstack: cs_staticnat: add network arg, used for VPC support

* cloudstack: cs_staticnat: removed unused code
This commit is contained in:
René Moser 2016-05-27 20:57:09 +02:00
parent 039005bfaa
commit abe406f074
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cloud/cloudstack/cs_staticnat.py
View file

@ -42,6 +42,12 @@ options:
- VM guest NIC secondary IP address for the static NAT.
required: false
default: false
network:
description:
- Network the IP address is related to.
required: false
default: null
version_added: "2.2"
state:
description:
- State of the static NAT.
@ -198,6 +204,7 @@ class AnsibleCloudStackStaticNat(AnsibleCloudStack):
args['virtualmachineid'] = self.get_vm(key='id')
args['ipaddressid'] = ip_address['id']
args['vmguestip'] = self.get_vm_guest_ip()
args['networkid'] = self.get_network(key='id')
if not self.module.check_mode:
res = self.cs.enableStaticNat(**args)
if 'errortext' in res:
@ -223,7 +230,7 @@ class AnsibleCloudStackStaticNat(AnsibleCloudStack):
res = self.cs.disableStaticNat(ipaddressid=ip_address['id'])
if 'errortext' in res:
self.module.fail_json(msg="Failed: '%s'" % res['errortext'])
res = self._poll_job(res, 'staticnat')
self._poll_job(res, 'staticnat')
res = self.cs.enableStaticNat(**args)
if 'errortext' in res:
self.module.fail_json(msg="Failed: '%s'" % res['errortext'])
@ -253,17 +260,17 @@ class AnsibleCloudStackStaticNat(AnsibleCloudStack):
self.module.fail_json(msg="Failed: '%s'" % res['errortext'])
poll_async = self.module.params.get('poll_async')
if poll_async:
res = self._poll_job(res, 'staticnat')
self._poll_job(res, 'staticnat')
return ip_address
def main():
argument_spec = cs_argument_spec()
argument_spec.update(dict(
ip_address = dict(required=True),
vm = dict(default=None),
vm_guest_ip = dict(default=None),
network = dict(default=None),
state = dict(choices=['present', 'absent'], default='present'),
zone = dict(default=None),
domain = dict(default=None),