Skip to content

A
ansible
Commit 603a5a08 by Michael DeHaan
Options

Merge pull request #1555 from pas256/devel 

Handle instances without keypairs
parents b79b8e5a 39efcd07
Showing with 2 additions and 1 deletions
plugins/inventory/ec2.py
...@@ -303,7 +303,8 @@ class Ec2Inventory(object): ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment