External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 00:38:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Always provide gce token_uri

Browse Source
This commit is contained in:
AlanCoding
2019-07-31 15:29:30 -04:00
parent 2faf69e3b5
commit 4399d9287d
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,10 +28,7 @@ def gce(cred, env, private_data_dir):
if 'INVENTORY_UPDATE_ID' not in env: if 'INVENTORY_UPDATE_ID' not in env:
env['GCE_EMAIL'] = username env['GCE_EMAIL'] = username
env['GCE_PROJECT'] = project env['GCE_PROJECT'] = project
else: json_cred['token_uri'] = 'https://oauth2.googleapis.com/token'
# gcp_compute inventory plugin requires token_uri
# although it probably should not, since gce_modules do not
json_cred['token_uri'] = 'https://oauth2.googleapis.com/token'
handle, path = tempfile.mkstemp(dir=private_data_dir) handle, path = tempfile.mkstemp(dir=private_data_dir)
f = os.fdopen(handle, 'w') f = os.fdopen(handle, 'w')