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

Fix credential env folder, test_tasks.py

Browse Source
This commit is contained in:
Alan Rominger
2021-04-21 09:46:56 -04:00
parent 11c5d577d6
commit 8f9373085a
5 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/credential/__init__.py
View File

@@ -498,7 +498,7 @@ class CredentialType(CommonModelNameNotUnique):
f.write(data)
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
# FIXME: develop some better means of referencing paths inside containers
container_path = os.path.join('/runner', os.path.basename(path))
container_path = os.path.join('/runner', 'env', os.path.basename(path))
# determine if filename indicates single file or many
if file_label.find('.') == -1:
@@ -536,7 +536,7 @@ class CredentialType(CommonModelNameNotUnique):
if extra_vars:
path = build_extra_vars_file(extra_vars, private_data_dir)
# FIXME: develop some better means of referencing paths inside containers
container_path = os.path.join('/runner', os.path.basename(path))
container_path = os.path.join('/runner', 'env', os.path.basename(path))
args.extend(['-e', '@%s' % container_path])

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

@@ -30,8 +30,9 @@ def gce(cred, env, private_data_dir):
json.dump(json_cred, f, indent=2)
f.close()
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
env['GCE_CREDENTIALS_FILE_PATH'] = os.path.join('/runner', os.path.basename(path))
env['GCP_SERVICE_ACCOUNT_FILE'] = os.path.join('/runner', os.path.basename(path))
cred_path = os.path.join('/runner', 'env', os.path.basename(path))
env['GCE_CREDENTIALS_FILE_PATH'] = cred_path
env['GCP_SERVICE_ACCOUNT_FILE'] = cred_path
# Handle env variables for new module types.
# This includes gcp_compute inventory plugin and
@@ -103,7 +104,7 @@ def openstack(cred, env, private_data_dir):
f.close()
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
# TODO: constant for container base path
env['OS_CLIENT_CONFIG_FILE'] = os.path.join('/runner', os.path.basename(path))
env['OS_CLIENT_CONFIG_FILE'] = os.path.join('/runner', 'env', os.path.basename(path))
def kubernetes_bearer_token(cred, env, private_data_dir):
@@ -115,6 +116,6 @@ def kubernetes_bearer_token(cred, env, private_data_dir):
with os.fdopen(handle, 'w') as f:
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
f.write(cred.get_input('ssl_ca_cert'))
env['K8S_AUTH_SSL_CA_CERT'] = os.path.join('/runner', os.path.basename(path))
env['K8S_AUTH_SSL_CA_CERT'] = os.path.join('/runner', 'env', os.path.basename(path))
else:
env['K8S_AUTH_VERIFY_SSL'] = 'False'