From 54204608afc2ebcc8d09d9cb2585cfa888a15709 Mon Sep 17 00:00:00 2001
From: Jason Montleon <jmontleo@redhat.com>
Date: Fri, 21 Oct 2016 10:00:01 -0400
Subject: [PATCH] fix postgresql and add pvc for db storage

---
 postgresql-centos7-atomicapp/Nulecule           |  1 +
 .../artifacts/kubernetes/postgresql-pod.yaml    | 17 ++++++++++++-----
 .../artifacts/kubernetes/volume.yaml            | 10 ++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 postgresql-centos7-atomicapp/artifacts/kubernetes/volume.yaml

diff --git a/postgresql-centos7-atomicapp/Nulecule b/postgresql-centos7-atomicapp/Nulecule
index 3c49532..0322738 100644
--- a/postgresql-centos7-atomicapp/Nulecule
+++ b/postgresql-centos7-atomicapp/Nulecule
@@ -26,6 +26,7 @@ graph:
       kubernetes:
         - file://artifacts/kubernetes/postgresql-pod.yaml
         - file://artifacts/kubernetes/postgresql-service.yaml
+        - file://artifacts/openshift/volume.yaml
       openshift:
         - inherit:
           - kubernetes
diff --git a/postgresql-centos7-atomicapp/artifacts/kubernetes/postgresql-pod.yaml b/postgresql-centos7-atomicapp/artifacts/kubernetes/postgresql-pod.yaml
index d972555..2d980b0 100644
--- a/postgresql-centos7-atomicapp/artifacts/kubernetes/postgresql-pod.yaml
+++ b/postgresql-centos7-atomicapp/artifacts/kubernetes/postgresql-pod.yaml
@@ -7,13 +7,20 @@ metadata:
 spec:
   containers:
     - name: postgresql
-      image: centos/postgresql
+      image: centos/postgresql-95-centos7
       env:
-        - name: DB_NAME
+        - name: POSTGRESQL_DATABASE
           value: $db_name
-        - name: DB_USER
+        - name: POSTGRESQL_USER
           value: $db_user
-        - name: DB_PASS
-          value: $db_pass
+        - name: POSTGRESQL_PASSWORD
+          value: $dp_pass
       ports:
         - containerPort: 5432
+      volumeMounts:
+        - name: postgresql-persistent-storage
+          mountPath: /var/lib/pgsql/data
+  volumes:
+    - name: postgresql-persistent-storage
+      persistentVolumeClaim:
+       claimName: postgresql-claim
diff --git a/postgresql-centos7-atomicapp/artifacts/kubernetes/volume.yaml b/postgresql-centos7-atomicapp/artifacts/kubernetes/volume.yaml
new file mode 100644
index 0000000..f83c268
--- /dev/null
+++ b/postgresql-centos7-atomicapp/artifacts/kubernetes/volume.yaml
@@ -0,0 +1,10 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: postgresql-claim
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi