Merge pull request #1486 from resmo/for-ansible

[2.0.1] cloudstack: fixes and improvements
This commit is contained in:
Brian Coca 2016-01-18 21:05:11 -05:00
commit e9450df878

View file

@ -230,7 +230,7 @@ class AnsibleCloudStackPortforwarding(AnsibleCloudStack):
'publicport': 'public_port', 'publicport': 'public_port',
'publicendport': 'public_end_port', 'publicendport': 'public_end_port',
'privateport': 'private_port', 'privateport': 'private_port',
'private_end_port': 'private_end_port', 'privateendport': 'private_end_port',
} }
self.portforwarding_rule = None self.portforwarding_rule = None
self.vm_default_nic = None self.vm_default_nic = None
@ -322,7 +322,6 @@ class AnsibleCloudStackPortforwarding(AnsibleCloudStack):
args['publicendport'] = self.get_or_fallback('public_end_port', 'public_port') args['publicendport'] = self.get_or_fallback('public_end_port', 'public_port')
args['privateport'] = self.module.params.get('private_port') args['privateport'] = self.module.params.get('private_port')
args['privateendport'] = self.get_or_fallback('private_end_port', 'private_port') args['privateendport'] = self.get_or_fallback('private_end_port', 'private_port')
args['openfirewall'] = self.module.params.get('open_firewall')
args['vmguestip'] = self.get_vm_guest_ip() args['vmguestip'] = self.get_vm_guest_ip()
args['ipaddressid'] = self.get_ip_address(key='id') args['ipaddressid'] = self.get_ip_address(key='id')
args['virtualmachineid'] = self.get_vm(key='id') args['virtualmachineid'] = self.get_vm(key='id')