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

Remove unnecessary wait_timeout parameter.

Browse source
This commit is contained in:
Robert Estelle 2014-11-14 00:31:45 -05:00
parent c36e8947bc
commit 063d3d97c6
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cloud/amazon/ec2_eip.py
View file

@ -42,12 +42,6 @@ options:
required: false required: false
default: false default: false
version_added: "1.6" version_added: "1.6"
wait_timeout:
description:
- how long to wait in seconds for newly provisioned EIPs to become'''
''' available
default: 300
version_added: "1.7"
extends_documentation_fragment: aws extends_documentation_fragment: aws
author: Lorin Hochstein <lorin@nimbisservices.com> author: Lorin Hochstein <lorin@nimbisservices.com>
@ -141,20 +135,26 @@ def disassociate_ip_and_instance(ec2, address, instance_id, check_mode):
return {'changed': True} return {'changed': True}
def find_address(ec2, public_ip, wait_timeout): def _find_address_by_ip(ec2, public_ip):
""" Find an existing Elastic IP address """
deadline = time.time() + wait_timeout
while True:
try: try:
return ec2.get_all_addresses([public_ip])[0] return ec2.get_all_addresses([public_ip])[0]
except boto.exception.EC2ResponseError as e: except boto.exception.EC2ResponseError as e:
if "Address '{}' not found.".format(public_ip) not in e.message: if "Address '{}' not found.".format(public_ip) not in e.message:
raise raise
if time.time() >= deadline:
raise EIPException('wait for EIPs timeout on {}' def _find_address_by_instance_id(ec2, instance_id):
.format(time.asctime())) addresses = ec2.get_all_addresses(None, {'instance-id': instance_id})
time.sleep(5) if addresses:
return addresses[0]
def find_address(ec2, public_ip, instance_id):
""" Find an existing Elastic IP address """
if public_ip:
return _find_address_by_ip(ec2, public_ip)
elif instance_id:
return _find_address_by_instance_id(ec2, instance_id)
def address_is_associated_with_instance(ec2, address, instance_id): def address_is_associated_with_instance(ec2, address, instance_id):
@ -270,11 +270,9 @@ def main():
in_vpc = module.params.get('in_vpc') in_vpc = module.params.get('in_vpc')
domain = 'vpc' if in_vpc else None domain = 'vpc' if in_vpc else None
reuse_existing_ip_allowed = module.params.get('reuse_existing_ip_allowed') reuse_existing_ip_allowed = module.params.get('reuse_existing_ip_allowed')
wait_timeout = int(module.params.get('wait_timeout'))
try: try:
if public_ip: address = find_address(ec2, public_ip, instance_id)
address = find_address(ec2, public_ip, wait_timeout)
if state == 'present': if state == 'present':
result = ensure_present(ec2, domain, address, instance_id, result = ensure_present(ec2, domain, address, instance_id,