From 2965a9091e200817c9464983d340d9a0da3af90b Mon Sep 17 00:00:00 2001
From: Yanis Guenane <yguenane@gmail.com>
Date: Thu, 29 Apr 2021 17:33:05 +0200
Subject: [PATCH] PostgreSQL: Properly handle variable name difference when
 using Red Hat containers

---
 .../installer/templates/tower_postgres.yaml.j2 | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/roles/installer/templates/tower_postgres.yaml.j2 b/roles/installer/templates/tower_postgres.yaml.j2
index 000837df..a98086a8 100644
--- a/roles/installer/templates/tower_postgres.yaml.j2
+++ b/roles/installer/templates/tower_postgres.yaml.j2
@@ -32,6 +32,24 @@ spec:
         - image: '{{ tower_postgres_image }}:{{ tower_postgres_image_version }}'
           name: postgres
           env:
+            # For tower_postgres_image based on rhel8/postgresql-12
+            - name: POSTGRESQL_DATABASE
+              valueFrom:
+                secretKeyRef:
+                  name: '{{ meta.name }}-postgres-configuration'
+                  key: database
+            - name: POSTGRESQL_USER
+              valueFrom:
+                secretKeyRef:
+                  name: '{{ meta.name }}-postgres-configuration'
+                  key: username
+            - name: POSTGRESQL_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: '{{ meta.name }}-postgres-configuration'
+                  key: password
+
+            # For tower_postgres_image based on postgres
             - name: POSTGRES_DB
               valueFrom:
                 secretKeyRef: