While I haven't done this, it is possible to bring up an instance

without a keypair, so this takes care of that scenario
bdunbar · Nov 8, 2012 · 39efcd0 · 39efcd0
1 parent 36c1b4b
commit 39efcd0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/plugins/inventory/ec2.py b/plugins/inventory/ec2.py
@@ -303,7 +303,8 @@ def add_instance(self, instance, region):
         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: