From 45d9cfcc6fded4c17a28fe77d5f04c173a396332 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Mon, 11 Jan 2016 11:55:25 -0600 Subject: [PATCH] Coalesce forms of ssh_args in order of most specific to least --- lib/ansible/plugins/connection/paramiko_ssh.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/ansible/plugins/connection/paramiko_ssh.py b/lib/ansible/plugins/connection/paramiko_ssh.py index 21dfe0c7bc..dfac62b7a8 100644 --- a/lib/ansible/plugins/connection/paramiko_ssh.py +++ b/lib/ansible/plugins/connection/paramiko_ssh.py @@ -144,9 +144,13 @@ class Connection(ConnectionBase): def _parse_proxy_command(self, port=22): proxy_command = None # Parse ansible_ssh_common_args, specifically looking for ProxyCommand - ssh_common_args = getattr(self._play_context, 'ssh_common_args', None) + ssh_args = [ + getattr(self._play_context, 'ssh_extra_args', ''), + getattr(self._play_context, 'ssh_common_args', ''), + getattr(self._play_context, 'ssh_args', ''), + ] if ssh_common_args is not None: - args = self._split_ssh_args(ssh_common_args) + args = self._split_ssh_args(' '.join(ssh_args)) for i, arg in enumerate(args): if arg.lower() == 'proxycommand': # _split_ssh_args split ProxyCommand from the command itself