External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Adjust inventory update env test to allow duplicate references

Browse Source 
change gce injectors to not duplicate the credentials file
This commit is contained in:
AlanCoding
2019-07-12 16:32:23 -04:00
committed by Alex Stephen
parent cb60f12b6b
commit 2439aa409d
29 changed files with 91 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/credential/injectors.py
View File

@@ -39,12 +39,6 @@ def gce(cred, env, private_data_dir):
f.close()
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
env['GCE_CREDENTIALS_FILE_PATH'] = path
handle, path = tempfile.mkstemp(dir=private_data_dir)
f = os.fdopen(handle, 'w')
json.dump(json_cred, f, indent=2)
f.close()
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
env['GCP_SERVICE_ACCOUNT_FILE'] = path
# Handle env variables for new module types.