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

Merge pull request #4320 from jdekoning/ssh-machine-creds-fix

Browse Source 
Insert signed public key in artifact_dir, fix for issue #4139

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-07-12 18:37:57 +00:00
committed by GitHub
parent b26bd11924 94b1455f40
commit a9bb1eba02
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -828,8 +828,10 @@ class BaseTask(object):
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR) os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
private_data_files['credentials'][credential] = path private_data_files['credentials'][credential] = path
for credential, data in private_data.get('certificates', {}).items(): for credential, data in private_data.get('certificates', {}).items():
name = 'credential_%d-cert.pub' % credential.pk artifact_dir = os.path.join(private_data_dir, 'artifacts', str(self.instance.id))
path = os.path.join(private_data_dir, name) if not os.path.exists(artifact_dir):
os.makedirs(artifact_dir, mode=0o700)
path = os.path.join(artifact_dir, 'ssh_key_data-cert.pub')
with open(path, 'w') as f: with open(path, 'w') as f:
f.write(data) f.write(data)
f.close() f.close()