From a762538a09db57e44f57b18b73f0572635d93e1e Mon Sep 17 00:00:00 2001 From: Alberto Gonzalez Rodriguez Date: Mon, 6 Jan 2025 16:16:41 +0100 Subject: [PATCH] showroom-multi-user-ssh (#8944) --- .../ocp4_workload_showroom/tasks/deploy-showroom-helm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_showroom/tasks/deploy-showroom-helm.yaml b/ansible/roles_ocp_workloads/ocp4_workload_showroom/tasks/deploy-showroom-helm.yaml index dd9d0503965..636ea092642 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_showroom/tasks/deploy-showroom-helm.yaml +++ b/ansible/roles_ocp_workloads/ocp4_workload_showroom/tasks/deploy-showroom-helm.yaml @@ -59,8 +59,8 @@ autoSshToBastion: "{{ (true if ocp4_workload_showroom_wetty_ssh_bastion_login | bool else false) | bool | string | lower }}" sshAuth: password sshHost: "{{ _showroom_user_data.bastion_public_hostname }}" - sshUser: "{{ _showroom_user_data.bastion_ssh_user_name }}" - sshPass: "{{ _showroom_user_data.bastion_ssh_password }}" + sshUser: "{{ _showroom_user_data['users'][_showroom_user].bastion_ssh_user_name | default(_showroom_user_data.bastion_ssh_user_name) }}" + sshPass: "{{ _showroom_user_data['users'][_showroom_user].bastion_ssh_password | default(_showroom_user_data.bastion_ssh_password) }}" sshPort: "{{ _showroom_user_data.bastion_ssh_port | default(22) }}" novnc: setup: "{{ (true if ocp4_workload_showroom_novnc_enable | bool else false) | bool | string | lower }}"