Merge pull request #1544 from pas256/devel

Adding more instance groups
pull/4420/head
Michael DeHaan 2012-11-07 04:06:02 -08:00
commit 8bd56926f1
1 changed files with 7 additions and 1 deletions

View File

@ -299,6 +299,12 @@ class Ec2Inventory(object):
# Inventory: Group by availability zone # Inventory: Group by availability zone
self.push(self.inventory, instance.placement, dest) 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 # Inventory: Group by security group
try: try:
for group in instance.groups: for group in instance.groups: