cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix sshkeyfilename is None not str (#44893)

Browse source 
(cherry picked from commit 177fbea351)
This commit is contained in:
linnil1 2018-09-04 14:29:08 +08:00 committed by Toshio Kuratomi
parent 25025d8246
commit ceb90f6632
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/plugins/connection/netconf.py
View file

@ -256,7 +256,7 @@ class Connection(NetworkConnectionBase):
self.key_filename = self._play_context.private_key_file or self.get_option('private_key_file') self.key_filename = self._play_context.private_key_file or self.get_option('private_key_file')
if self.key_filename: if self.key_filename:
self.key_filename = os.path.expanduser(self.key_filename) self.key_filename = str(os.path.expanduser(self.key_filename))
if self._network_os == 'default': if self._network_os == 'default':
for cls in netconf_loader.all(class_only=True): for cls in netconf_loader.all(class_only=True):
@ -279,7 +279,7 @@ class Connection(NetworkConnectionBase):
port=self._play_context.port or 830, port=self._play_context.port or 830,
username=self._play_context.remote_user, username=self._play_context.remote_user,
password=self._play_context.password, password=self._play_context.password,
key_filename=str(self.key_filename), key_filename=self.key_filename,
hostkey_verify=self.get_option('host_key_checking'), hostkey_verify=self.get_option('host_key_checking'),
look_for_keys=self.get_option('look_for_keys'), look_for_keys=self.get_option('look_for_keys'),
device_params=device_params, device_params=device_params,