From 053ec790923fe3c1cb459435afd609a7c9364965 Mon Sep 17 00:00:00 2001 From: nate stephany Date: Fri, 27 Feb 2026 16:42:51 +0100 Subject: [PATCH] ocp4_workload_ols: Restore auth workload variable references in defaults Use ocp4_workload_authentication_* variables as defaults so the role automatically picks up the correct values when the auth workload is present, while still falling back to sensible literals if it is not. --- roles/ocp4_workload_ols/defaults/main.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/roles/ocp4_workload_ols/defaults/main.yaml b/roles/ocp4_workload_ols/defaults/main.yaml index e070589..f52310f 100644 --- a/roles/ocp4_workload_ols/defaults/main.yaml +++ b/roles/ocp4_workload_ols/defaults/main.yaml @@ -100,22 +100,23 @@ ocp4_workload_ols_loglevel: DEBUG # User Access Configuration # -------------------------------- -# Auth provider type: htpasswd or keycloak -ocp4_workload_ols_auth_provider: htpasswd +# Auth provider type: htpasswd or keycloak. +# Defaults to the value set by ocp4_workload_authentication, or htpasswd if not present. +ocp4_workload_ols_auth_provider: "{{ ocp4_workload_authentication_provider | default('htpasswd') }}" # Admin username to exclude when granting lightspeed-operator-query-access. -ocp4_workload_ols_admin_username: admin +ocp4_workload_ols_admin_username: "{{ ocp4_workload_authentication_admin_username | default('admin') }}" # --- htpasswd provider settings --- # Name of the htpasswd secret in openshift-config namespace. -ocp4_workload_ols_htpasswd_secret_name: htpasswd +ocp4_workload_ols_htpasswd_secret_name: "{{ ocp4_workload_authentication_htpasswd_secret_name | default('htpasswd') }}" # --- keycloak provider settings --- # Namespace where Keycloak is installed. -ocp4_workload_ols_keycloak_namespace: keycloak +ocp4_workload_ols_keycloak_namespace: "{{ ocp4_workload_authentication_keycloak_namespace | default('keycloak') }}" # Keycloak realm name (also the KeycloakRealmImport CR name). -ocp4_workload_ols_keycloak_realm: sso +ocp4_workload_ols_keycloak_realm: "{{ ocp4_workload_authentication_keycloak_default_realm | default('sso') }}" # -------------------------------- # Debug and Demo Settings