From 37fd56f5445557aef836b1704db0a6647a20241d Mon Sep 17 00:00:00 2001 From: Judd Maltin Date: Wed, 13 Jul 2022 14:18:00 -0400 Subject: [PATCH] add user data where missing (#5097) --- .../ocp4_workload_authentication/tasks/workload.yml | 3 +++ .../ocp4_workload_gitea_operator/tasks/workload.yml | 3 +++ .../ocp4_workload_rhacs/tasks/post_workload.yml | 2 ++ .../ocp4_workload_vscode_bastion/tasks/workload.yml | 3 +++ 4 files changed, 11 insertions(+) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_authentication/tasks/workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_authentication/tasks/workload.yml index 87755261967..e727ed0bb20 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_authentication/tasks/workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_authentication/tasks/workload.yml @@ -137,6 +137,9 @@ Cluster admin users are `{{ ocp4_workload_authentication_admin_users | join('`, `') }}`. All cluster admin users have password `{{ ocp4_workload_authentication_admin_password }}`. {%- endif -%} + data: + openshift_cluster_admin_password: "{{ ocp4_workload_authentication_admin_password }}" + openshift_cluster_admin_username: "{{ ocp4_workload_authentication_admin_users[0] }}" - name: Print user information for each user when: ocp4_workload_authentication_enable_user_info_data | bool diff --git a/ansible/roles_ocp_workloads/ocp4_workload_gitea_operator/tasks/workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_gitea_operator/tasks/workload.yml index c98a53de493..6ffc11ff2dc 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_gitea_operator/tasks/workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_gitea_operator/tasks/workload.yml @@ -159,6 +159,9 @@ when: ocp4_workload_gitea_operator_create_admin | bool agnosticd_user_info: msg: "{{ item }}" + data: + gitea_admin_username: "{{ ocp4_workload_gitea_operator_admin_user }}" + gitea_admin_password: "{{ r_gitea_admin_password.resources[0].status.adminPassword }}" loop: - "The Gitea admin username is '{{ ocp4_workload_gitea_operator_admin_user }}'." - "The Gitea admin password is '{{ r_gitea_admin_password.resources[0].status.adminPassword }}'." diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhacs/tasks/post_workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_rhacs/tasks/post_workload.yml index b6fd0e0b85b..3e34bfeca1b 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_rhacs/tasks/post_workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_rhacs/tasks/post_workload.yml @@ -43,6 +43,8 @@ acs_route: "https://{{ acs_route }}" web_console_url: "https://{{ r_console_route.resources[0].spec.host }}" api_url: "{{ r_api_url.resources[0].status.apiServerURL }}" + acs_portal_username: "admin" + acs_portal_password: "{{ ocp4_workload_rhacs_central_admin_password }}" # Leave this as the last task in the playbook. - name: post_workload tasks complete diff --git a/ansible/roles_ocp_workloads/ocp4_workload_vscode_bastion/tasks/workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_vscode_bastion/tasks/workload.yml index 1eeac0f3ffa..d9fb660aedf 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_vscode_bastion/tasks/workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_vscode_bastion/tasks/workload.yml @@ -228,6 +228,9 @@ - name: Print User Info agnosticd_user_info: msg: "{{ item }}" + data: + visual_studio_code_server: "{{ _ocp4_workload_vscode_bastion_url }}" + visual_studio_code_password: "{{ ocp4_workload_vscode_bastion_vscode_password }}" loop: - "" - "Visual Studio Code Server is available on the Bastion VM."