diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-07-06 18:01:12 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-07-11 13:28:50 -0400 |
| commit | b39cad5897ef80244e6496ccd5a6c5ec0cd577b6 (patch) | |
| tree | cbcd1ee8dcb1ce2d5b444bdec687d41f29487ed2 | |
| parent | 5f51278dee925c47055aacbb8ffac5e351ea7ee2 (diff) | |
| download | openshift-b39cad5897ef80244e6496ccd5a6c5ec0cd577b6.tar.gz openshift-b39cad5897ef80244e6496ccd5a6c5ec0cd577b6.tar.bz2 openshift-b39cad5897ef80244e6496ccd5a6c5ec0cd577b6.tar.xz openshift-b39cad5897ef80244e6496ccd5a6c5ec0cd577b6.zip | |
ansible.cfg: improve ssh ControlPath
AWS hosts and user names frequently make the default Ansible ControlPath
too long. This prevents ssh persistent connections, significantly
impacting runtime. More detail: https://github.com/ansible/ansible/issues/11536
This config change shortens the ControlPath to make this less likely. It
would be better to change it to the %C hash, as extremely long hostnames
or usernames could still encounter this problem, but that is not yet
available with RHEL's openssh. This at least improves the situation.
| -rw-r--r-- | ansible.cfg | 4 | ||||
| -rw-r--r-- | utils/etc/ansible.cfg | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ansible.cfg b/ansible.cfg index 0c74d63da..14b77ba0f 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -29,3 +29,7 @@ nocows = True # Additional ssh options for OpenShift Ansible [ssh_connection] pipelining = True +# shorten the ControlPath which is often too long; when it is, +# ssh connection reuse silently fails, making everything slower. +control_path = %(directory)s/%%h-%%r + diff --git a/utils/etc/ansible.cfg b/utils/etc/ansible.cfg index 3425e7e62..f7e6fe2ff 100644 --- a/utils/etc/ansible.cfg +++ b/utils/etc/ansible.cfg @@ -28,3 +28,9 @@ deprecation_warnings = False # remote_tmp - set if provided by user (cli) # ssh_args - set if provided by user (cli) # control_path + +# Additional ssh options for OpenShift Ansible +[ssh_connection] +# shorten the ControlPath which is often too long; when it is, +# ssh connection reuse silently fails, making everything slower. +control_path = %(directory)s/%%h-%%r |