Merge pull request #1555 from pas256/devel

Handle instances without keypairs
pull/1648/head
Michael DeHaan 12 years ago
commit 603a5a0803

@ -303,7 +303,8 @@ class Ec2Inventory(object):
self.push(self.inventory, self.to_safe('type_' + instance.instance_type), dest) self.push(self.inventory, self.to_safe('type_' + instance.instance_type), dest)
# Inventory: Group by key pair # Inventory: Group by key pair
self.push(self.inventory, self.to_safe('key_' + instance.key_name), dest) if instance.key_name != None:
self.push(self.inventory, self.to_safe('key_' + instance.key_name), dest)
# Inventory: Group by security group # Inventory: Group by security group
try: try:

Loading…
Cancel
Save