From 40726a804a1411e9258ce8071b1f1740d18fcae5 Mon Sep 17 00:00:00 2001
From: Tyler Auerbeck <tauerbec@redhat.com>
Date: Thu, 12 Mar 2020 00:19:58 -0400
Subject: [PATCH] Update templates to use new variable to allow postgres to run
 on OCP

---
 roles/tower/defaults/main.yml                | 2 ++
 roles/tower/templates/tower_postgres.yaml.j2 | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/roles/tower/defaults/main.yml b/roles/tower/defaults/main.yml
index 6ca7320a..e804e89d 100644
--- a/roles/tower/defaults/main.yml
+++ b/roles/tower/defaults/main.yml
@@ -32,3 +32,5 @@ tower_postgres_pass: awxpass
 tower_postgres_image: postgres:10
 tower_postgres_storage_request: 8Gi
 tower_postgres_storage_class: ''
+
+tower_postgres_data_path: '/var/lib/postgresql/data/pgdata'
diff --git a/roles/tower/templates/tower_postgres.yaml.j2 b/roles/tower/templates/tower_postgres.yaml.j2
index 6986e4df..acb0dcdc 100644
--- a/roles/tower/templates/tower_postgres.yaml.j2
+++ b/roles/tower/templates/tower_postgres.yaml.j2
@@ -43,13 +43,15 @@ spec:
                 secretKeyRef:
                   name: '{{ meta.name }}-postgres-pass'
                   key: password
+            - name: PGDATA
+              value: '{{ tower_postgres_data_path }}'
           ports:
             - containerPort: 3306
               name: postgres
           volumeMounts:
             - name: postgres
-              mountPath: /var/lib/postgresql/data
-              subPath: data
+              mountPath: '{{ tower_postgres_data_path | dirname }}'
+              subPath: '{{ tower_postgres_data_path | dirname | basename }}'
   volumeClaimTemplates:
     - metadata:
         name: postgres