diff options
| author | James Tanner <tanner.jc@gmail.com> | 2013-11-22 12:22:53 -0500 |
|---|---|---|
| committer | James Tanner <tanner.jc@gmail.com> | 2013-11-22 12:22:53 -0500 |
| commit | bca2634d54b598c7ef974226250b33aafbb261d3 (patch) | |
| tree | f9e49fd06522fa31825f6d6805a45a7758066dc5 | |
| parent | a16fe923ede8e3ab0e072bbb3006ca3ff1f3727a (diff) | |
| download | ansible-bca2634d54b598c7ef974226250b33aafbb261d3.tar.gz | |
Fix missing eval for string search in ssh controlpersist
| -rw-r--r-- | lib/ansible/runner/connection_plugins/ssh.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/runner/connection_plugins/ssh.py b/lib/ansible/runner/connection_plugins/ssh.py index 28e4ad5f4c..68c6f17d4a 100644 --- a/lib/ansible/runner/connection_plugins/ssh.py +++ b/lib/ansible/runner/connection_plugins/ssh.py @@ -247,7 +247,7 @@ class Connection(object): # the host to known hosts is not intermingled with multiprocess output. fcntl.lockf(self.runner.output_lockfile, fcntl.LOCK_UN) fcntl.lockf(self.runner.process_lockfile, fcntl.LOCK_UN) - controlpersisterror = stderr.find('Bad configuration option: ControlPersist') or stderr.find('unknown configuration option: ControlPersist') != -1 + controlpersisterror = stderr.find('Bad configuration option: ControlPersist') != -1 or stderr.find('unknown configuration option: ControlPersist') != -1 if p.returncode != 0 and controlpersisterror: raise errors.AnsibleError('using -c ssh on certain older ssh versions may not support ControlPersist, set ANSIBLE_SSH_ARGS="" (or ansible_ssh_args in the config file) before running again') |