ansible-test - Fix inventory generation.

pull/75860/head
Matt Clay 3 years ago
parent 68ab92e22a
commit 099d80829f

@ -0,0 +1,2 @@
bugfixes:
- ansible-test - Use the correct variable to reference the client's SSH key when generating inventory.

@ -463,7 +463,7 @@ class NetworkRemoteProfile(RemoteProfile[NetworkRemoteConfig]):
ansible_host=connection.hostname, ansible_host=connection.hostname,
ansible_port=connection.port, ansible_port=connection.port,
ansible_user=connection.username, ansible_user=connection.username,
ansible_ssh_private_key=core_ci.ssh_key.key, ansible_ssh_private_key_file=core_ci.ssh_key.key,
ansible_network_os=f'{self.config.collection}.{self.config.platform}' if self.config.collection else self.config.platform, ansible_network_os=f'{self.config.collection}.{self.config.platform}' if self.config.collection else self.config.platform,
) )
@ -689,7 +689,7 @@ class WindowsRemoteProfile(RemoteProfile[WindowsRemoteConfig]):
ansible_port=connection.port, ansible_port=connection.port,
ansible_user=connection.username, ansible_user=connection.username,
ansible_password=connection.password, ansible_password=connection.password,
ansible_ssh_private_key=core_ci.ssh_key.key, ansible_ssh_private_key_file=core_ci.ssh_key.key,
) )
# HACK: force 2016 to use NTLM + HTTP message encryption # HACK: force 2016 to use NTLM + HTTP message encryption

@ -148,7 +148,7 @@ def create_posix_inventory(args, path, target_hosts, needs_ssh=False): # type:
ansible_host=ssh.settings.host, ansible_host=ssh.settings.host,
ansible_port=ssh.settings.port, ansible_port=ssh.settings.port,
ansible_user=ssh.settings.user, ansible_user=ssh.settings.user,
ansible_ssh_private_key=ssh.settings.identity_file, ansible_ssh_private_key_file=ssh.settings.identity_file,
) )
if ssh.become: if ssh.become:

Loading…
Cancel
Save