From 054e640fbaa27c6925f655be1d8e9de38e8f1616 Mon Sep 17 00:00:00 2001 From: Khushil Dep Date: Fri, 26 Feb 2016 10:51:54 +0000 Subject: [PATCH 1/2] Add enumeration of block devices to ec2_block_devices --- contrib/inventory/ec2.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/inventory/ec2.py b/contrib/inventory/ec2.py index 77e8128d03..6cb400b42f 100755 --- a/contrib/inventory/ec2.py +++ b/contrib/inventory/ec2.py @@ -37,6 +37,7 @@ When run against a specific host, this script returns the following variables: - ec2_attachTime - ec2_attachment - ec2_attachmentId + - ec2_block_devices - ec2_client_token - ec2_deleteOnTermination - ec2_description @@ -1323,6 +1324,10 @@ class Ec2Inventory(object): group_names.append(group.name) 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]) + elif key == 'ec2_block_device_mapping': + instance_vars["ec2_block_devices"] = {} + for k, v in value.iteritems(): + instance_vars["ec2_block_devices"][ ( k.split( '/' ) )[ -1 ] ] = v.volume_id else: pass # TODO Product codes if someone finds them useful From 08db04ccb65e4771117095938d66e08105df0c7e Mon Sep 17 00:00:00 2001 From: Khushil Dep Date: Wed, 14 Sep 2016 15:01:24 +0100 Subject: [PATCH 2/2] Changes as per @abadger --- contrib/inventory/ec2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/inventory/ec2.py b/contrib/inventory/ec2.py index 6cb400b42f..3def6037a1 100755 --- a/contrib/inventory/ec2.py +++ b/contrib/inventory/ec2.py @@ -1326,8 +1326,8 @@ class Ec2Inventory(object): 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.iteritems(): - instance_vars["ec2_block_devices"][ ( k.split( '/' ) )[ -1 ] ] = v.volume_id + for k, v in value.items(): + instance_vars["ec2_block_devices"][ os.path.basename(k) ] = v.volume_id else: pass # TODO Product codes if someone finds them useful