From 42944bd3592181303efffcf4652683595af3a8fd Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Tue, 2 May 2023 20:37:19 +0200 Subject: [PATCH] chore: fix pmci error - wordpress isn't mandatory --- group_vars/connect_wordpress/main.yml | 3 --- pmci-realm-client-create.yml | 4 ++-- roles/connect_realm/defaults/main.yml | 20 ++++++++------------ 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/group_vars/connect_wordpress/main.yml b/group_vars/connect_wordpress/main.yml index 21f2478..6018b75 100644 --- a/group_vars/connect_wordpress/main.yml +++ b/group_vars/connect_wordpress/main.yml @@ -9,6 +9,3 @@ connect_wordpress_oidc_issuer: "{{ http_s }}://{{ shared_service_hostname_keycl connect_wordpress_oidc_provider_url: "{{ http_s }}://{{ shared_service_hostname_keycloak }}/auth/realms/{{ current_realm_name }}" connect_wordpress_oidc_client_id: "{{ cluster_name }}" connect_wordpress_oidc_client_secret: "{{ cluster_name }}" - -connect_wordpress_buergerportal_username: "buergerportal" -connect_wordpress_buergerportal_password: "Buerger?P0rtal." diff --git a/pmci-realm-client-create.yml b/pmci-realm-client-create.yml index 8258c57..d0012ae 100644 --- a/pmci-realm-client-create.yml +++ b/pmci-realm-client-create.yml @@ -36,8 +36,8 @@ current_realm_name: "{{ tenant.key }}" # legacy paramater, backwards compatibility connect_client_admin_username: "{{ data.connect.admin.username }}" # legacy paramater, backwards compatibility connect_client_admin_password: "{{ data.connect.admin.password }}" # legacy paramater, backwards compatibility - connect_wordpress_buergerportal_username: "{{ data.wordpress.admin.username }}" # legacy paramater, backwards compatibility - connect_wordpress_buergerportal_password: "{{ data.wordpress.admin.password }}" # legacy paramater, backwards compatibility + connect_wordpress_buergerportal_username: "{{ data.wordpress.admin.username | default() }}" # legacy paramater, backwards compatibility + connect_wordpress_buergerportal_password: "{{ data.wordpress.admin.password | default() }}" # legacy paramater, backwards compatibility pre_tasks: - name: "Import autodiscover pre-tasks" diff --git a/roles/connect_realm/defaults/main.yml b/roles/connect_realm/defaults/main.yml index 6781380..ab1e180 100644 --- a/roles/connect_realm/defaults/main.yml +++ b/roles/connect_realm/defaults/main.yml @@ -24,18 +24,14 @@ current_realm_clients: [ } ] -current_realm_users_base: [ - { - "username": "{{ connect_client_admin_username }}", - "password": "{{ connect_client_admin_password }}", - } -] -current_realm_users_wordpress: [ - { - "username": "{{ connect_wordpress_buergerportal_username | default() }}", - "password": "{{ connect_wordpress_buergerportal_password | default() }}", - } -] +current_realm_users_base: + - username: "{{ connect_client_admin_username }}" + password: "{{ connect_client_admin_password }}" + +current_realm_users_wordpress: + - username: "{{ connect_wordpress_buergerportal_username | default() }}" + password: "{{ connect_wordpress_buergerportal_password | default() }}" + current_realm_users: >- {%- if 'connect_wordpress' in groups -%} [{{ current_realm_users_base + current_realm_users_wordpress }}]