From f5aed745037f150423250a7af7f300c2d54c00d0 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Thu, 9 Aug 2018 12:06:46 -0400 Subject: [PATCH] fill in network ssh password protected keys --- awx/main/tasks.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 28c11b13a2..8a3c7e8416 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1119,6 +1119,18 @@ class RunJob(BaseTask): if value not in ('', 'ASK'): passwords[field] = value + ''' + Only 1 value can be provided for a unique prompt string. Prefer ssh + key unlock over network key unlock. + ''' + if 'ssh_key_unlock' not in passwords: + for cred in job.network_credentials: + if cred.inputs.get('ssh_key_unlock'): + passwords['ssh_key_unlock'] = kwargs.get( + 'ssh_key_unlock', + decrypt_field(cred, 'ssh_key_unlock') + ) + return passwords def build_env(self, job, **kwargs):