valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20263 from JohannesEbke/develop

Browse Source 
Make AssociatePublicIpAddress work to fix #19288
This commit is contained in:
Joseph Hall 2015-01-30 14:12:04 -07:00
commit 4ce02f960d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/cloud/clouds/ec2.py
View File

@ -1086,9 +1086,9 @@ def _request_eip(interface):
return None
def _create_eni(interface):
def _create_eni_if_necessary(interface):
'''
Create and return an Elastic Interface
Create an Elastic Interface if necessary and return a Network Interface Specification
'''
params = {'Action': 'DescribeSubnets'}
subnet_query = aws.query(params,
@ -1111,6 +1111,11 @@ def _create_eni(interface):
'No such subnet <{0}>'.format(interface['SubnetId'])
)
if 'AssociatePublicIpAddress' in interface:
# Associating a public address in a VPC only works when the interface is not
# created beforehand, but as a part of the machine creation request.
return interface
params = {'Action': 'CreateNetworkInterface',
'SubnetId': interface['SubnetId']}
@ -1494,7 +1499,7 @@ def request_instance(vm_=None, call=None):
eni_devices = []
for interface in network_interfaces:
log.debug('Create network interface: {0}'.format(interface))
_new_eni = _create_eni(interface)
_new_eni = _create_eni_if_necessary(interface)
eni_devices.append(_new_eni)
params.update(_param_from_config(spot_prefix + 'NetworkInterface',
eni_devices))