diff options
| author | Brian Coca <brian.coca+git@gmail.com> | 2017-10-03 09:54:32 -0400 |
|---|---|---|
| committer | Brian Coca <brian.coca+git@gmail.com> | 2017-10-03 14:35:28 -0400 |
| commit | fa131f9a07ea22e225296bd6a7260618a51a01bd (patch) | |
| tree | c4673fd8411ec309331cfd8199374ae63cea0c69 /lib/ansible/config | |
| parent | 74e0643dbb2ce4989516460fc4d71fb95f07e501 (diff) | |
| download | ansible-fa131f9a07ea22e225296bd6a7260618a51a01bd.tar.gz | |
make pipelining actually backwards compatible
restore ssh specific setting the global, in the future these will be separate.
(cherry picked from commit 2d70dc7f21e88ab9049479bc08c7e559aa10753f)
Diffstat (limited to 'lib/ansible/config')
| -rw-r--r-- | lib/ansible/config/base.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index 278c09ad8d..ee5f42c0a5 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -160,9 +160,14 @@ ANSIBLE_PIPELINING: - This can result in a very significant performance improvement when enabled. - "However this conflicts with privilege escalation (become). For example, when using 'sudo:' operations you must first disable 'requiretty' in /etc/sudoers on all managed hosts, which is why it is disabled by default." - env: [{name: ANSIBLE_PIPELINING}] + env: + - name: ANSIBLE_SSH_PIPELINING + - name: ANSIBLE_PIPELINING ini: - - {key: pipelining, section: connection} + - section: connection + key: pipelining + - section: ssh_connection + key: pipelining type: boolean yaml: {key: plugins.connection.pipelining} ANSIBLE_SSH_ARGS: |