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

Fix for py2.6 (no dict comprehensions on py2.6)

Browse source
This commit is contained in:
Toshio Kuratomi 2015-03-11 19:07:55 -07:00 committed by Matt Clay
parent c9cc8d0b70
commit c9b33d5de2
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/modules/cloud/amazon/ec2.py
View file

@ -593,7 +593,8 @@ def get_instance_info(inst):
'state': inst.state, 'state': inst.state,
'hypervisor': inst.hypervisor, 'hypervisor': inst.hypervisor,
'tags': inst.tags, 'tags': inst.tags,
'groups': {group.id: group.name for group in inst.groups}} 'groups': dict((group.id, group.name) for group in inst.groups),
}
try: try:
instance_info['virtualization_type'] = getattr(inst,'virtualization_type') instance_info['virtualization_type'] = getattr(inst,'virtualization_type')
except AttributeError: except AttributeError: