Merge pull request #1544 from pas256/devel

Adding more instance groups
2012-11-07 04:06:02 -08:00 · 2012-11-07 04:06:02 -08:00 · 8bd56926f1
parent 7cd013f854 aa0434535e
commit 8bd56926f1
1 changed files with 7 additions and 1 deletions
--- a/plugins/inventory/ec2.py
+++ b/plugins/inventory/ec2.py
@ -299,6 +299,12 @@ class Ec2Inventory(object):
        # Inventory: Group by availability zone
        self.push(self.inventory, instance.placement, dest)
        
+        # Inventory: Group by instance type
+        self.push(self.inventory, self.to_safe('type_' + instance.instance_type), dest)
+        
+        # Inventory: Group by key pair
+        self.push(self.inventory, self.to_safe('key_' + instance.key_name), dest)
+        
        # Inventory: Group by security group
        try:
            for group in instance.groups: