zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-16 15:58:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #551 from ansible/tower_inventory_source

Browse Source 
Tower inventory source
This commit is contained in:
Matthew Jones
2017-10-27 08:41:24 -04:00
committed by GitHub
parent c323a2393a 85be3c7692
commit f019452207
16 changed files with 210 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/tasks.py
+3
View File
@@ -1918,6 +1918,9 @@ class RunInventoryUpdate(BaseTask):
for env_k in inventory_update.source_vars_dict:
if str(env_k) not in env and str(env_k) not in settings.INV_ENV_VARIABLE_BLACKLIST:
env[str(env_k)] = unicode(inventory_update.source_vars_dict[env_k])
elif inventory_update.source == 'tower':
env['TOWER_INVENTORY'] = inventory_update.instance_filters
env['TOWER_LICENSE_TYPE'] = get_licenser().validate()['license_type']
elif inventory_update.source == 'file':
raise NotImplementedError('Cannot update file sources through the task system.')
# add private_data_files