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

Merge pull request #12965 from matburt/fix_ec2_nested_groups

Browse source 
Fix ec2 infinitely nested groups
This commit is contained in:
James Cammarata 2015-10-29 13:31:59 -04:00
commit 6d89676a42
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/inventory/ec2.py
View file

@ -703,7 +703,8 @@ class Ec2Inventory(object):
self.push(self.inventory, key, dest)
if self.nested_groups:
self.push_group(self.inventory, 'tags', self.to_safe("tag_" + k))
self.push_group(self.inventory, self.to_safe("tag_" + k), key)
if v:
self.push_group(self.inventory, self.to_safe("tag_" + k), key)
# Inventory: Group by Route53 domain names if enabled
if self.route53_enabled and self.group_by_route53_names:
@ -1309,3 +1310,4 @@ class Ec2Inventory(object):
# Run the script
Ec2Inventory()