zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-30 20:01:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #542 from jangsutsr/fix-7737

Browse Source 
[3.2.2]support `AZURE_CLOUD_ENVIRONMENT`
This commit is contained in:
Aaron Tan
2017-10-26 10:20:14 -04:00
committed by GitHub
parent 4f58537949 f28b48a473
commit e24e1fc1f0
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/tasks.py
View File

@@ -1890,6 +1890,9 @@ class RunInventoryUpdate(BaseTask):
env['AZURE_AD_USER'] = passwords.get('source_username', '')
env['AZURE_PASSWORD'] = passwords.get('source_password', '')
env['AZURE_INI_PATH'] = cloud_credential
if inventory_update.credential and \
inventory_update.credential.inputs.get('cloud_environment', None):
env['AZURE_CLOUD_ENVIRONMENT'] = inventory_update.credential.inputs['cloud_environment']
elif inventory_update.source == 'gce':
env['GCE_EMAIL'] = passwords.get('source_username', '')
env['GCE_PROJECT'] = passwords.get('source_project', '')