External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-29 15:24:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6764 from AlanCoding/management_json_bug

Browse Source 
Fix bug where isolated management jobs could not load JSON output
This commit is contained in:
Alan Rominger 2017-06-28 11:52:22 -04:00 committed by GitHub
commit 7d283f1dfd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/isolated/isolated_manager.py
View File

@ -166,7 +166,7 @@ class IsolatedManager(object):
isolated_key = os.path.join(isolated_ssh_path, '.isolated') isolated_key = os.path.join(isolated_ssh_path, '.isolated')
ssh_sock = os.path.join(isolated_ssh_path, '.isolated_ssh_auth.sock') ssh_sock = os.path.join(isolated_ssh_path, '.isolated_ssh_auth.sock')
run.open_fifo_write(isolated_key, settings.AWX_ISOLATED_PRIVATE_KEY) run.open_fifo_write(isolated_key, settings.AWX_ISOLATED_PRIVATE_KEY)
pexpect_args = run.wrap_args_with_ssh_agent(pexpect_args, isolated_key, ssh_sock) pexpect_args = run.wrap_args_with_ssh_agent(pexpect_args, isolated_key, ssh_sock, silence_ssh_add=True)
return run.run_pexpect(pexpect_args, *args, **kw) return run.run_pexpect(pexpect_args, *args, **kw)
finally: finally:
if isolated_ssh_path: if isolated_ssh_path:

7
awx/main/isolated/run.py
View File

@ -27,9 +27,12 @@ def args2cmdline(*args):
return ' '.join([pipes.quote(a) for a in args]) return ' '.join([pipes.quote(a) for a in args])
def wrap_args_with_ssh_agent(args, ssh_key_path, ssh_auth_sock=None): def wrap_args_with_ssh_agent(args, ssh_key_path, ssh_auth_sock=None, silence_ssh_add=False):
if ssh_key_path: if ssh_key_path:
cmd = ' && '.join([args2cmdline('ssh-add', ssh_key_path), ssh_add_command = args2cmdline('ssh-add', ssh_key_path)
if silence_ssh_add:
ssh_add_command = ' '.join([ssh_add_command, '2>/dev/null'])
cmd = ' && '.join([ssh_add_command,
args2cmdline('rm', '-f', ssh_key_path), args2cmdline('rm', '-f', ssh_key_path),
args2cmdline(*args)]) args2cmdline(*args)])
args = ['ssh-agent'] args = ['ssh-agent']