restores pre 2.3 behavior with respects to keys (#23083)

This removes the requirement to configure look_for_keys=False and
restores the behavior to disable key lookup if no key was provided.
pull/23087/head
Peter Sprygada 8 years ago committed by GitHub
parent 6f77498700
commit 88ce6fd273

@ -26,6 +26,7 @@ import datetime
import traceback import traceback
import logging import logging
from ansible import constants as C
from ansible.errors import AnsibleConnectionFailure from ansible.errors import AnsibleConnectionFailure
from ansible.module_utils.six.moves import StringIO from ansible.module_utils.six.moves import StringIO
from ansible.plugins import terminal_loader from ansible.plugins import terminal_loader
@ -74,6 +75,10 @@ class Connection(_Connection):
def _connect(self): def _connect(self):
"""Connections to the device and sets the terminal type""" """Connections to the device and sets the terminal type"""
if self._play_context.password and not self._play_context.private_key_file:
C.PARAMIKO_LOOK_FOR_KEYS = False
super(Connection, self)._connect() super(Connection, self)._connect()
display.display('ssh connection done, setting terminal', log_only=True) display.display('ssh connection done, setting terminal', log_only=True)

Loading…
Cancel
Save