cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1555 from pas256/devel

Browse source 
Handle instances without keypairs
This commit is contained in:
Michael DeHaan 2012-11-08 16:43:30 -08:00
commit 603a5a0803
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/inventory/ec2.py
View file

@ -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: