From 62ba0840031441d8794a4cc2a67f78357680627b Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 1 Feb 2017 14:20:22 -0800 Subject: [PATCH] Do not substitute ssh_exeuctable until we need to We need to use ssh_executable instead of hardcoding ssh in the command we run but we need to use "ssh" when we lookup the value of the {command}_extra_args variable. Do this by leaving binary as "ssh" and only expanding when we place it into b_command. Fixes #20862 --- lib/ansible/plugins/connection/ssh.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ansible/plugins/connection/ssh.py b/lib/ansible/plugins/connection/ssh.py index 135fe7a933..d1c61fd801 100644 --- a/lib/ansible/plugins/connection/ssh.py +++ b/lib/ansible/plugins/connection/ssh.py @@ -158,7 +158,10 @@ class Connection(ConnectionBase): self.sshpass_pipe = os.pipe() b_command += [b'sshpass', b'-d' + to_bytes(self.sshpass_pipe[0], nonstring='simplerepr', errors='surrogate_or_strict')] - b_command += [to_bytes(binary, errors='surrogate_or_strict')] + if binary == 'ssh': + b_command += [to_bytes(self._play_context.ssh_executable, errors='surrogate_or_strict')] + else: + b_command += [to_bytes(binary, errors='surrogate_or_strict')] # # Next, additional arguments based on the configuration. @@ -608,13 +611,10 @@ class Connection(ConnectionBase): # data into /usr/bin/python inside a tty automatically invokes the # python interactive-mode but the modules are not compatible with the # interactive-mode ("unexpected indent" mainly because of empty lines) - - ssh_executable = self._play_context.ssh_executable - if not in_data and sudoable: - args = (ssh_executable, '-tt', self.host, cmd) + args = ('ssh', '-tt', self.host, cmd) else: - args = (ssh_executable, self.host, cmd) + args = ('ssh', self.host, cmd) cmd = self._build_command(*args) (returncode, stdout, stderr) = self._run(cmd, in_data, sudoable=sudoable) @@ -773,7 +773,7 @@ class Connection(ConnectionBase): # temporarily disabled as we are forced to currently close connections after every task because of winrm # if self._connected and self._persistent: # ssh_executable = self._play_context.ssh_executable - # cmd = self._build_command(ssh_executable, '-O', 'stop', self.host) + # cmd = self._build_command('ssh', '-O', 'stop', self.host) # # cmd = map(to_bytes, cmd) # p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)