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

Now this disassociates EIPs from instances inside a VPC correctly. Time

Browse source 
for a PR.
This commit is contained in:
Peter Sankauskas 2013-10-18 15:12:49 -07:00
parent 9f279618fe
commit 27fa111c4d
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cloud/ec2_eip
View file

@ -154,15 +154,22 @@ def associate_ip_and_instance(ec2, address, instance_id, module):
module.fail_json(msg="association failed")
def disassociate_ip_and_instance(ec2, public_ip, instance_id, module):
if not ip_is_associated_with_instance(ec2, public_ip, instance_id, module):
module.exit_json(changed=False, public_ip=public_ip)
def disassociate_ip_and_instance(ec2, address, instance_id, module):
if not ip_is_associated_with_instance(ec2, address.public_ip, instance_id, module):
module.exit_json(changed=False, public_ip=address.public_ip)
# If we're in check mode, nothing else to do
if module.check_mode:
module.exit_json(changed=True)
res = ec2.disassociate_address(public_ip)
try:
if address.domain == "vpc":
res = ec2.disassociate_address(association_id=address.association_id)
else:
res = ec2.disassociate_address(public_ip=address.public_ip)
except boto.exception.EC2ResponseError, e:
module.fail_json(msg=str(e))
if res:
module.exit_json(changed=True)
else:
@ -279,7 +286,8 @@ def main():
if instance_id is None:
release_address(ec2, public_ip, module)
else:
disassociate_ip_and_instance(ec2, public_ip, instance_id, module)
address = find_address(ec2, public_ip, module)
disassociate_ip_and_instance(ec2, address, instance_id, module)