From 3dbd7ed2cf97092ef346f26bac802c3a4624c247 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Tue, 16 Aug 2016 08:50:21 -0400
Subject: Sync remaining content

---
 .../v1.3/db-templates/postgresql-ephemeral-template.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-ephemeral-template.json')

diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-ephemeral-template.json
index e90244a6b..2b4b2a0cd 100644
--- a/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/v1.3/db-templates/postgresql-ephemeral-template.json
@@ -60,7 +60,7 @@
               ],
               "from": {
                 "kind": "ImageStreamTag",
-                "name": "postgresql:latest",
+                "name": "postgresql:9.5",
                 "namespace": "${NAMESPACE}"
               },
               "lastTriggeredImage": ""
@@ -121,10 +121,10 @@
                   }
                 ],
                 "resources": {
-		    "limits": {
-			"memory": "${MEMORY_LIMIT}"
-		    }
-		},
+                  "limits": {
+                    "memory": "${MEMORY_LIMIT}"
+                  }
+                },
                 "volumeMounts": [
                   {
                     "name": "${DATABASE_SERVICE_NAME}-data",
@@ -178,7 +178,7 @@
     },
     {
       "name": "POSTGRESQL_USER",
-      "displayName": "PostgreSQL User",
+      "displayName": "PostgreSQL Connection Username",
       "description": "Username for PostgreSQL user that will be used for accessing the database.",
       "generate": "expression",
       "from": "user[A-Z0-9]{3}",
@@ -186,8 +186,8 @@
     },
     {
       "name": "POSTGRESQL_PASSWORD",
-      "displayName": "PostgreSQL Password",
-      "description": "Password for the PostgreSQL user.",
+      "displayName": "PostgreSQL Connection Password",
+      "description": "Password for the PostgreSQL connection user.",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}",
       "required": true
-- 
cgit v1.2.3