From 262c8d9a8bd1646ba793e8f6eb2714a6ac443220 Mon Sep 17 00:00:00 2001
From: Pedro Ruivo <pruivo@redhat.com>
Date: Thu, 8 Feb 2024 11:48:14 +0000
Subject: [PATCH] Use the new remote-store options

---
 .../minikube/keycloak/templates/keycloak.yaml |  8 +++----
 provision/rosa-cross-dc/Taskfile.yaml         | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/provision/minikube/keycloak/templates/keycloak.yaml b/provision/minikube/keycloak/templates/keycloak.yaml
index b5f4ee773..10e9cf677 100644
--- a/provision/minikube/keycloak/templates/keycloak.yaml
+++ b/provision/minikube/keycloak/templates/keycloak.yaml
@@ -87,15 +87,15 @@ spec:
       value: 'true'
 {{- if .Values.infinispan.remoteStore.enabled }}
     # tag::keycloak-ispn[]
-    - name: remote-store-host # <2>
+    - name: cache-remote-host # <2>
       value: {{ quote .Values.infinispan.remoteStore.host }}
-    - name: remote-store-port # <2>
+    - name: cache-remote-port # <2>
       value: {{ quote .Values.infinispan.remoteStore.port }}
-    - name: remote-store-username # <3>
+    - name: cache-remote-username # <3>
       secret:
         name: remote-store-secret
         key: username
-    - name: remote-store-password # <3>
+    - name: cache-remote-password # <3>
       secret:
         name: remote-store-secret
         key: password
diff --git a/provision/rosa-cross-dc/Taskfile.yaml b/provision/rosa-cross-dc/Taskfile.yaml
index b6eb31ee7..f14da4111 100644
--- a/provision/rosa-cross-dc/Taskfile.yaml
+++ b/provision/rosa-cross-dc/Taskfile.yaml
@@ -279,16 +279,9 @@ tasks:
           KC_ADMIN_PASSWORD:
             sh: "aws secretsmanager get-secret-value --region eu-central-1 --secret-id keycloak-master-password --query SecretString --output text --no-cli-pager || echo admin"
           KC_DATABASE: "aurora-postgres"
-          KC_CUSTOM_INFINISPAN_CONFIG: "true"
-          KC_CUSTOM_INFINISPAN_CONFIG_FILE: "config/kcb-infinispan-cache-remote-store-config.xml"
+          KC_CUSTOM_INFINISPAN_CONFIG: "false"
           KC_ISPN_CLUSTER: "infinispan"
           ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME}}"
-      - task: wait-cryostat
-        vars:
-          ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME}}"
-      - task: wait-keycloak
-        vars:
-          ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME}}"
 
   wait-keycloak:
     desc: "Waits for Keycloak conditions"
@@ -356,6 +349,18 @@ tasks:
           ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME_2}}"
           KC_HOSTNAME_OVERRIDE: "{{.KC_CLIENT_URL}}"
           KC_HEALTH_HOSTNAME: "{{.KC_HEALTH_URL_CLUSTER_2}}"
+      - task: wait-cryostat
+        vars:
+          ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME_1}}"
+      - task: wait-cryostat
+        vars:
+          ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME_2}}"
+      - task: wait-keycloak
+        vars:
+          ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME_1}}"
+      - task: wait-keycloak
+        vars:
+          ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME_2}}"
       - task: create-env-configmap
         vars:
           ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME_1}}"