Merge pull request #747 from barraponto/ec2_instance_info

Add ec2 instance tags and groups info
10 years ago · 0c53b9033c
parent 6169a4fce5 5854f53cdc
commit 0c53b9033c
1 changed files with 3 additions and 1 deletions
--- a/cloud/amazon/ec2.py
+++ b/cloud/amazon/ec2.py
@ -591,7 +591,9 @@ def get_instance_info(inst):
                     'root_device_type': inst.root_device_type,
                     'root_device_name': inst.root_device_name,
                     'state': inst.state,
-                     'hypervisor': inst.hypervisor}
+                     'hypervisor': inst.hypervisor,
+                     'tags': inst.tags,
+                     'groups': {group.id: group.name for group in inst.groups}}
    try:
        instance_info['virtualization_type'] = getattr(inst,'virtualization_type')
    except AttributeError: