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

Merge pull request #14676 from tes/devel

Browse source 
Add enumeration of block devices to ec2_block_devices
This commit is contained in:
Abhijit Menon-Sen 2016-09-14 20:13:12 +05:30 committed by GitHub
commit c654a4617a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/inventory/ec2.py
View file

@ -37,6 +37,7 @@ When run against a specific host, this script returns the following variables:
- ec2_attachTime - ec2_attachTime
- ec2_attachment - ec2_attachment
- ec2_attachmentId - ec2_attachmentId
- ec2_block_devices
- ec2_client_token - ec2_client_token
- ec2_deleteOnTermination - ec2_deleteOnTermination
- ec2_description - ec2_description
@ -1323,6 +1324,10 @@ class Ec2Inventory(object):
group_names.append(group.name) group_names.append(group.name)
instance_vars["ec2_security_group_ids"] = ','.join([str(i) for i in group_ids]) instance_vars["ec2_security_group_ids"] = ','.join([str(i) for i in group_ids])
instance_vars["ec2_security_group_names"] = ','.join([str(i) for i in group_names]) instance_vars["ec2_security_group_names"] = ','.join([str(i) for i in group_names])
elif key == 'ec2_block_device_mapping':
instance_vars["ec2_block_devices"] = {}
for k, v in value.items():
instance_vars["ec2_block_devices"][ os.path.basename(k) ] = v.volume_id
else: else:
pass pass
# TODO Product codes if someone finds them useful # TODO Product codes if someone finds them useful