Only ignore redis errors in management pod

ansible · Jun 8, 2020 · fbe1736 · fbe1736
1 parent e77ca20
commit fbe1736
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
@@ -439,7 +439,6 @@ def IS_TESTING(argv=None):
 }
 
 # Django Caching Configuration
-DJANGO_REDIS_IGNORE_EXCEPTIONS = True
 CACHES = {
     'default': {
         'BACKEND': 'django_redis.cache.RedisCache',

diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml
@@ -246,6 +246,8 @@
 
 - name: Migrate database
   shell: |
+    {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} exec ansible-tower-management -- \
+      bash -c "echo 'DJANGO_REDIS_IGNORE_EXCEPTIONS = True' > /etc/tower/conf.d/redis.py"
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} exec ansible-tower-management -- \
       bash -c "awx-manage migrate --noinput"
 

diff --git a/installer/roles/kubernetes/templates/management-pod.yml.j2 b/installer/roles/kubernetes/templates/management-pod.yml.j2
@@ -27,7 +27,13 @@ spec:
           readOnly: true
 
         - name: "{{ kubernetes_deployment_name }}-application-credentials"
-          mountPath: "/etc/tower/conf.d/"
+          mountPath: "/etc/tower/conf.d/environment.sh"
+          subPath: environment.sh
+          readOnly: true
+
+        - name: "{{ kubernetes_deployment_name }}-application-credentials"
+          mountPath: "/etc/tower/conf.d/credentials.py"
+          subPath: credentials.py
           readOnly: true
 
         - name: {{ kubernetes_deployment_name }}-secret-key

diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml
@@ -31,8 +31,7 @@ services:
     volumes:
       - "../:/awx_devel"
       - "../awx/projects/:/var/lib/awx/projects/"
-      - "./redis/redis_socket_standalone:/var/run/redis/"
-      - "./rsyslog/:/var/lib/awx/rsyslog"
+      - "./redis/redis_socket_standalone:/var/run/redis/" 
       - "./docker-compose/supervisor.conf:/etc/supervisord.conf"
     privileged: true
     tty: true