zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-29 11:21:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

AC-1302 Update EC2 inventory script to create hierarchical groups.

Browse Source 
Conflicts:
	awx/main/tests/inventory.py
This commit is contained in:
Chris Church
2014-05-25 23:53:34 -04:00
parent f377a03c60
commit 7229f9cc8f
5 changed files with 102 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/tasks.py
View File

@@ -806,6 +806,7 @@ class RunInventoryUpdate(BaseTask):
ec2_opts.setdefault('destination_variable', 'public_dns_name')
ec2_opts.setdefault('vpc_destination_variable', 'ip_address')
ec2_opts.setdefault('route53', 'False')
ec2_opts.setdefault('nested_groups', 'True')
ec2_opts['cache_path'] = tempfile.mkdtemp(prefix='awx_ec2_')
ec2_opts['cache_max_age'] = '300'
for k,v in ec2_opts.items():