From 452908620f5ffefbd21f955a7732e03e29196697 Mon Sep 17 00:00:00 2001
From: Nick Carboni <ncarboni@redhat.com>
Date: Tue, 6 Feb 2018 11:50:49 -0500
Subject: [PATCH] Mount the configmap into the directory the new image expects

This will be included into the main postgresql.conf automatically.
Because this path is tied directly to the implementation, there is no
reason to expose it to the user as a parameter.

https://bugzilla.redhat.com/show_bug.cgi?id=1540957
---
 templates/miq-template.yaml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/templates/miq-template.yaml b/templates/miq-template.yaml
index abcbbef3f..e3a8cf8e9 100644
--- a/templates/miq-template.yaml
+++ b/templates/miq-template.yaml
@@ -623,7 +623,7 @@ objects:
           - name: miq-pgdb-volume
             mountPath: "/var/lib/pgsql/data"
           - name: miq-pg-configs
-            mountPath: "${POSTGRESQL_CONFIG_DIR}"
+            mountPath: "/opt/app-root/src/postgresql-config/"
           env:
           - name: POSTGRESQL_USER
             value: "${DATABASE_USER}"
@@ -638,8 +638,6 @@ objects:
             value: "${POSTGRESQL_MAX_CONNECTIONS}"
           - name: POSTGRESQL_SHARED_BUFFERS
             value: "${POSTGRESQL_SHARED_BUFFERS}"
-          - name: POSTGRESQL_CONFIG_DIR
-            value: "${POSTGRESQL_CONFIG_DIR}"
           resources:
             requests:
               memory: "${POSTGRESQL_MEM_REQ}"
@@ -812,10 +810,6 @@ parameters:
   displayName: Memcached Slab Page Size
   description: Memcached size of each slab page.
   value: 1m
-- name: POSTGRESQL_CONFIG_DIR
-  displayName: PostgreSQL Configuration Overrides
-  description: Directory used to store PostgreSQL configuration overrides.
-  value: "/var/lib/pgsql/conf.d"
 - name: POSTGRESQL_MAX_CONNECTIONS
   displayName: PostgreSQL Max Connections
   description: PostgreSQL maximum number of database connections allowed.