Merge pull request #1555 from pas256/devel

Handle instances without keypairs
12 years ago · 603a5a0803
parent b79b8e5a99 39efcd0766
commit 603a5a0803
1 changed files with 2 additions and 1 deletions
--- a/plugins/inventory/ec2.py
+++ b/plugins/inventory/ec2.py
@ -303,7 +303,8 @@ class Ec2Inventory(object):
        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)
+        if instance.key_name != None:
+            self.push(self.inventory, self.to_safe('key_' + instance.key_name), dest)
        
        # Inventory: Group by security group
        try: