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

Merge pull request #2753 from jonhadfield/return_allocation_id

Browse source 
return allocation id for address created in vpc
This commit is contained in:
Brian Coca 2016-01-11 18:49:31 -05:00
commit 1b8487ffce
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/amazon/ec2_eip.py
View file

@ -279,7 +279,7 @@ def ensure_present(ec2, domain, address, device_id,
changed = changed or assoc_result['changed'] changed = changed or assoc_result['changed']
return {'changed': changed, 'public_ip': address.public_ip} return {'changed': changed, 'public_ip': address.public_ip, 'allocation_id': address.allocation_id}
def ensure_absent(ec2, domain, address, device_id, check_mode, isinstance=True): def ensure_absent(ec2, domain, address, device_id, check_mode, isinstance=True):
@ -355,7 +355,7 @@ def main():
module.check_mode, isinstance=is_instance) module.check_mode, isinstance=is_instance)
else: else:
address = allocate_address(ec2, domain, reuse_existing_ip_allowed) address = allocate_address(ec2, domain, reuse_existing_ip_allowed)
result = {'changed': True, 'public_ip': address.public_ip} result = {'changed': True, 'public_ip': address.public_ip, 'allocation_id': address.allocation_id}
else: else:
if device_id: if device_id:
disassociated = ensure_absent(ec2, domain, address, device_id, module.check_mode, isinstance=is_instance) disassociated = ensure_absent(ec2, domain, address, device_id, module.check_mode, isinstance=is_instance)