From 0e0f413e82edb56126e72b5f2b036e8f4fdbf23b Mon Sep 17 00:00:00 2001
From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com>
Date: Mon, 28 Aug 2023 16:50:00 -0400
Subject: [PATCH] Revert "Switch to using the sclorg redis image for
 consistency (#1531)" (#1536)

---
 .../deploying-a-specific-version-of-awx.md                    | 2 +-
 roles/installer/defaults/main.yml                             | 4 ++--
 roles/installer/templates/deployments/task.yaml.j2            | 2 +-
 roles/installer/templates/deployments/web.yaml.j2             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md
index c1075a758..62da4e9db 100644
--- a/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md
+++ b/docs/user-guide/advanced-configuration/deploying-a-specific-version-of-awx.md
@@ -9,7 +9,7 @@ There are a few variables that are customizable for awx the image management.
 | image_pull_policy   | The pull policy to adopt  | IfNotPresent                            |
 | image_pull_secrets  | The pull secrets to use   | None                                    |
 | ee_images           | A list of EEs to register | quay.io/ansible/awx-ee:latest           |
-| redis_image         | Path of the image to pull | quay.io/sclorg/redis-6-c9s              |
+| redis_image         | Path of the image to pull | docker.io/redis                         |
 | redis_image_version | Image version to pull     | latest                                  |
 
 Example of customization could be:
diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml
index cbb158959..62a171add 100644
--- a/roles/installer/defaults/main.yml
+++ b/roles/installer/defaults/main.yml
@@ -237,8 +237,8 @@ extra_volumes: ''
 
 _image: quay.io/ansible/awx
 _image_version: "{{ lookup('env', 'DEFAULT_AWX_VERSION') or 'latest' }}"
-_redis_image: quay.io/sclorg/redis-6-c9s
-_redis_image_version: latest
+_redis_image: docker.io/redis
+_redis_image_version: 7
 _postgres_image: postgres
 _postgres_image_version: 13
 image_pull_policy: IfNotPresent
diff --git a/roles/installer/templates/deployments/task.yaml.j2 b/roles/installer/templates/deployments/task.yaml.j2
index 8d74c2c56..cb57fbd13 100644
--- a/roles/installer/templates/deployments/task.yaml.j2
+++ b/roles/installer/templates/deployments/task.yaml.j2
@@ -157,7 +157,7 @@ spec:
             - name: {{ ansible_operator_meta.name }}-redis-socket
               mountPath: "/var/run/redis"
             - name: "{{ ansible_operator_meta.name }}-redis-data"
-              mountPath: "/var/lib/redis/data"
+              mountPath: "/data"
 {% if termination_grace_period_seconds is defined %}
             - name: pre-stop-data
               mountPath: /var/lib/pre-stop
diff --git a/roles/installer/templates/deployments/web.yaml.j2 b/roles/installer/templates/deployments/web.yaml.j2
index a741065f1..466351b69 100644
--- a/roles/installer/templates/deployments/web.yaml.j2
+++ b/roles/installer/templates/deployments/web.yaml.j2
@@ -147,7 +147,7 @@ spec:
             - name: {{ ansible_operator_meta.name }}-redis-socket
               mountPath: "/var/run/redis"
             - name: "{{ ansible_operator_meta.name }}-redis-data"
-              mountPath: "/var/lib/redis/data"
+              mountPath: "/data"
           resources: {{ redis_resource_requirements }}
         - image: '{{ _image }}'
           name: '{{ ansible_operator_meta.name }}-web'