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

Fix attachment issue ( thanks @gunzy83 )

Browse source
This commit is contained in:
Filipe Niero Felisbino 2016-07-26 11:38:21 -03:00 committed by Matt Clay
parent f4ace1e9cc
commit 9ba2f0f266
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/extras/cloud/amazon/ec2_eni.py
View file

@ -241,7 +241,6 @@ try:
except ImportError:
HAS_BOTO = False
def get_eni_info(interface):
# Private addresses
@ -390,7 +389,10 @@ def modify_eni(connection, vpc_id, module, eni):
secondary_addresses_to_remove_count = current_secondary_address_count - secondary_private_ip_address_count
connection.unassign_private_ip_addresses(network_interface_id=eni.id, private_ip_addresses=current_secondary_addresses[:secondary_addresses_to_remove_count], dry_run=False)
if attached == True and instance_id is not None:
if attached == True:
if eni.attachment and eni.attachment.instance_id != instance_id:
detach_eni(eni, module)
if eni.attachment is None:
eni.attach(instance_id, device_index)
wait_for_eni(eni, "attached")
changed = True
@ -451,13 +453,20 @@ def find_eni(connection, module):
eni_id = module.params.get("eni_id")
subnet_id = module.params.get('subnet_id')
private_ip_address = module.params.get('private_ip_address')
instance_id = module.params.get('instance_id')
device_index = module.params.get('device_index')
try:
filters = {}
if private_ip_address:
filters['private-ip-address'] = private_ip_address
if subnet_id:
filters['subnet-id'] = subnet_id
if private_ip_address:
filters['private-ip-address'] = private_ip_address
else:
if instance_id:
filters['attachment.instance-id'] = instance_id
if device_index:
filters['attachment.device-index'] = device_index
eni_result = connection.get_all_network_interfaces(eni_id, filters=filters)
if len(eni_result) > 0: