Merge pull request #11730 from amenonsen/7730-rebase

Have paramiko use /etc/ssh_known_hosts (#7730 rebase)
2015-07-24 23:47:26 -04:00 · 2015-07-24 23:47:26 -04:00 · 491b5fea6a
parent 0858d97c44 e4df8c3d36
commit 491b5fea6a
1 changed files with 1 additions and 0 deletions
--- a/lib/ansible/plugins/connections/paramiko_ssh.py
+++ b/lib/ansible/plugins/connections/paramiko_ssh.py
@ -152,6 +152,7 @@ class Connection(ConnectionBase):
        self.keyfile = os.path.expanduser("~/.ssh/known_hosts")

        if C.HOST_KEY_CHECKING:
+            ssh.load_system_host_keys("/etc/ssh/ssh_known_hosts")
            ssh.load_system_host_keys()

        ssh.set_missing_host_key_policy(MyAddPolicy(self._new_stdin))