zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-06 08:21:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

AC-1071 Removed ssh_key_path option, only need to be able to accept PEM key format.

Browse Source
This commit is contained in:
Chris Church
2014-03-27 15:55:44 -04:00
parent 107fc85110
commit ce2ae2b945
5 changed files with 14 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -385,7 +385,7 @@ class RunJob(BaseTask):
as ssh_key_data).
'''
credential = getattr(job, 'credential', None)
if credential and credential.ssh_key_data:
if credential:
return decrypt_field(credential, 'ssh_key_data') or None
def build_passwords(self, job, **kwargs):
@@ -485,8 +485,7 @@ class RunJob(BaseTask):
# If private key isn't encrypted, pass the path on the command line.
ssh_key_path = kwargs.get('private_data_file', '')
ssh_key_path = ssh_key_path or (creds and creds.ssh_key_path) or ''
use_ssh_agent = 'ssh_key_unlock' in kwargs.get('passwords', {})
use_ssh_agent = bool(kwargs.get('passwords', {}).get('ssh_key_unlock', ''))
if ssh_key_path and not use_ssh_agent:
args.append('--private-key=%s' % ssh_key_path)
@@ -654,6 +653,7 @@ class RunProjectUpdate(BaseTask):
args.extend(['-e', json.dumps(extra_vars)])
args.append('project_update.yml')
# If using an SSH key, run using ssh-agent.
ssh_key_path = kwargs.get('private_data_file', '')
if ssh_key_path:
subcmds = [('ssh-add', ssh_key_path), args]