From fe4884e8f09b216f298b4fefdc26084a8be8930f Mon Sep 17 00:00:00 2001
From: Andrea Mandolo <andrea.mandolo@newvision.it>
Date: Mon, 22 Jun 2015 17:13:42 +0200
Subject: [PATCH] Added some block_device_mapping (disks) informations to EC2
 instance module ouput

---
 cloud/amazon/ec2.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py
index dc7d5d38dd3..ad2f8f8f71b 100644
--- a/cloud/amazon/ec2.py
+++ b/cloud/amazon/ec2.py
@@ -619,6 +619,19 @@ def get_instance_info(inst):
     except AttributeError:
         instance_info['ebs_optimized'] = False
 
+    try:
+        bdm_dict = {}
+        bdm = getattr(inst, 'block_device_mapping')
+        for device_name in bdm.keys():
+            bdm_dict[device_name] = {
+                'status': bdm[device_name].status,
+                'volume_id': bdm[device_name].volume_id,
+                'delete_on_termination': bdm[device_name].delete_on_termination
+            }
+        instance_info['block_device_mapping'] = bdm_dict
+    except AttributeError:
+        instance_info['block_device_mapping'] = False
+
     try:
         instance_info['tenancy'] = getattr(inst, 'placement_tenancy')
     except AttributeError: