External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-26 15:48:17 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3754 from AlanCoding/gce_env_var

Browse Source 
Simplify gce inventory plugin injector

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-04-24 16:25:09 +00:00
committed by GitHub
parent fad0274373 c36dbb3448
commit f60857013e
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,9 @@ def gce(cred, env, private_data_dir):
project = cred.get_input('project', default='')
username = cred.get_input('username', default='')
env['GCE_EMAIL'] = username
env['GCE_PROJECT'] = project
if 'INVENTORY_UPDATE_ID' not in env:
env['GCE_EMAIL'] = username
env['GCE_PROJECT'] = project
json_cred = {
'type': 'service_account',
'private_key': cred.get_input('ssh_key_data', default=''),