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 #27274 from rallytime/bp-27272

Browse source 
Back-port #27272 to 2015.8
This commit is contained in:
Nicole Thomas 2015-09-21 12:54:48 -06:00
commit 2be21d6451
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3078,6 +3078,7 @@ def _extract_instance_info(instances):
for item in instance['instancesSet']['item']:
name = _extract_name_tag(item)
ret[name] = item
ret[name]['name'] = name
ret[name].update(
dict(
id=item['instanceId'],
@ -3092,6 +3093,7 @@ def _extract_instance_info(instances):
item = instance['instancesSet']['item']
name = _extract_name_tag(item)
ret[name] = item
ret[name]['name'] = name
ret[name].update(
dict(
id=item['instanceId'],