From fa131f9a07ea22e225296bd6a7260618a51a01bd Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 3 Oct 2017 09:54:32 -0400 Subject: [PATCH] make pipelining actually backwards compatible restore ssh specific setting the global, in the future these will be separate. (cherry picked from commit 2d70dc7f21e88ab9049479bc08c7e559aa10753f) --- CHANGELOG.md | 1 + lib/ansible/config/base.yml | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cbb66d2a81..659dccd3a9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,6 +77,7 @@ Ansible Changes By Release * fixed redis cache typo * Fix AttributeError during inventory group deserialization (https://github.com/ansible/ansible/issues/30903) * Fix 'ansible-vault encrypt --output=-' (https://github.com/ansible/ansible/issues/30550) +* restore pre 2.4 pipeline configuration options (env and ini) diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index 278c09ad8dc..ee5f42c0a55 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: