Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
micafer committed May 15, 2018
1 parent 5bbdd59 commit 6238bbe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ record_host_keys=False
[ssh_connection]

# Only in systems with OpenSSH support to ControlPersist
ssh_args = -o ControlMaster=auto -o ControlPersist=900s -o StrictHostKeyChecking=no
ssh_args = -o ControlMaster=auto -o ControlPersist=900s -o UserKnownHostsFile=/dev/null
# In systems with older versions of OpenSSH (RHEL 6, CentOS 6, SLES 10 or SLES 11)
#ssh_args = -o StrictHostKeyChecking=no
#ssh_args = -o UserKnownHostsFile=/dev/null
pipelining = True
```

Expand Down
4 changes: 2 additions & 2 deletions contextualization/conf-ansible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@
when: (ansible_os_family == "RedHat" and ansible_distribution_major_version|int < 6) or (ansible_os_family == "Suse" and ansible_distribution_major_version|int < 10)

- name: Change ssh_args to set ControlPersist to 15 min in ansible.cfg
ini_file: dest=/etc/ansible/ansible.cfg section=ssh_connection option=ssh_args value="-o ControlMaster=auto -o ControlPersist=900s -o StrictHostKeyChecking=no"
ini_file: dest=/etc/ansible/ansible.cfg section=ssh_connection option=ssh_args value="-o ControlMaster=auto -o ControlPersist=900s -o UserKnownHostsFile=/dev/null"
when: ansible_os_family == "Debian" or (ansible_os_family == "RedHat" and ansible_distribution_major_version|int >= 7) or (ansible_os_family == "Suse" and ansible_distribution_major_version|int >= 12)

- name: Change ssh_args to remove ControlPersist in REL 6 and older in ansible.cfg
ini_file: dest=/etc/ansible/ansible.cfg section=ssh_connection option=ssh_args value="-o StrictHostKeyChecking=no"
ini_file: dest=/etc/ansible/ansible.cfg section=ssh_connection option=ssh_args value="-o UserKnownHostsFile=/dev/null"
when: (ansible_os_family == "RedHat" and ansible_distribution_major_version|int < 7) or (ansible_os_family == "Suse" and ansible_distribution_major_version|int < 12)

- name: Activate SSH pipelining in ansible.cfg
Expand Down

0 comments on commit 6238bbe

Please sign in to comment.