From b9904842aa65b7a7532aad1582921ba13edc87a9 Mon Sep 17 00:00:00 2001
From: Sylvain Chen <sylvain.chen1@gmail.com>
Date: Sun, 23 Aug 2020 22:04:10 +0200
Subject: [PATCH] Remove redis and memcached unused variables and their exposed
 ports

---
 roles/awx/templates/tower.yaml.j2        | 4 ----
 roles/awx/templates/tower_config.yaml.j2 | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/roles/awx/templates/tower.yaml.j2 b/roles/awx/templates/tower.yaml.j2
index 99206da8..ab38430f 100644
--- a/roles/awx/templates/tower.yaml.j2
+++ b/roles/awx/templates/tower.yaml.j2
@@ -37,16 +37,12 @@ spec:
           - '/var/run/memcached/memcached.sock'
           - '-a'
           - '0666'
-        ports:
-        - containerPort: 1121
         volumeMounts:
           - name: {{ meta.name }}-memcached-socket
             mountPath: "/var/run/memcached"
       - image: '{{ tower_redis_image }}'
         name: redis
         args: ["redis-server", "/etc/redis.conf"]
-        ports:
-        - containerPort: 6379
         volumeMounts:
           - name: {{ meta.name }}-redis-config
             mountPath: "/etc/redis.conf"
diff --git a/roles/awx/templates/tower_config.yaml.j2 b/roles/awx/templates/tower_config.yaml.j2
index ab05c318..9ae4152a 100644
--- a/roles/awx/templates/tower_config.yaml.j2
+++ b/roles/awx/templates/tower_config.yaml.j2
@@ -14,10 +14,6 @@ data:
     DATABASE_HOST='{{ meta.name }}-postgres.{{ meta.namespace }}.svc.cluster.local'
     DATABASE_PORT='5432'
     DATABASE_PASSWORD={{ tower_postgres_pass | quote }}
-    MEMCACHED_HOST='{{ meta.name }}-memcached.{{ meta.namespace }}.svc.cluster.local'
-    MEMCACHED_PORT='11211'
-    REDIS_HOST='{{ meta.name }}-redis.{{ meta.namespace }}.svc.cluster.local'
-    REDIS_PORT='6379'
     AWX_SKIP_MIGRATIONS=true
 
   settings: |