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 #29548 from rallytime/bp-29449

Browse source 
Back-port #29449 to 2015.8
This commit is contained in:
Mike Place 2015-12-09 09:19:07 -07:00
commit 3b2c93a2e5
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2036,6 +2036,9 @@ def query_instance(vm_=None, call=None):
log.debug('Returned query data: {0}'.format(data))
if 'ipAddress' in data[0]['instancesSet']['item']:
log.error(
'Public IP not detected. If private IP is meant for bootstrap you must specify "ssh_interface: private_ips" in your profile.'
)
return data
if ssh_interface(vm_) == 'private_ips' and \
'privateIpAddress' in data[0]['instancesSet']['item']: