saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #28584 from rallytime/fix-27574

Browse source 
If AssociatePublicIpAddress is set to True, don't auto-assign eip.
This commit is contained in:
Mike Place 2015-11-04 14:59:38 -07:00
commit ae764c6b5c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/cloud/clouds/ec2.py
View file

@ -1293,9 +1293,10 @@ def _create_eni_if_necessary(interface):
if isinstance(associate_public_ip, str):
# Assume id of EIP as value
_associate_eip_with_interface(eni_id, associate_public_ip)
elif interface.get('associate_eip'):
if interface.get('associate_eip'):
_associate_eip_with_interface(eni_id, interface.get('associate_eip'))
elif interface.get('allocate_new_eip') or associate_public_ip:
elif interface.get('allocate_new_eip'):
_new_eip = _request_eip(interface)
_associate_eip_with_interface(eni_id, _new_eip)
elif interface.get('allocate_new_eips'):