From de133ff75c912c588dc05ac8b9f9b6a6d29a9f99 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Thu, 24 Mar 2016 16:42:34 -0400
Subject: Sync latest db-templates and qucikstart-templates

---
 .../jenkins-persistent-template.json               | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'roles/openshift_examples/files/examples/v1.2/quickstart-templates/jenkins-persistent-template.json')

diff --git a/roles/openshift_examples/files/examples/v1.2/quickstart-templates/jenkins-persistent-template.json b/roles/openshift_examples/files/examples/v1.2/quickstart-templates/jenkins-persistent-template.json
index d98e729d4..6c143fc70 100644
--- a/roles/openshift_examples/files/examples/v1.2/quickstart-templates/jenkins-persistent-template.json
+++ b/roles/openshift_examples/files/examples/v1.2/quickstart-templates/jenkins-persistent-template.json
@@ -95,7 +95,7 @@
               "from": {
                 "kind": "ImageStreamTag",
                 "name": "jenkins:latest",
-                "namespace": "openshift"
+                "namespace": "${NAMESPACE}"
               },
               "lastTriggeredImage": ""
             }
@@ -180,27 +180,33 @@
   "parameters": [
     {
       "name": "MEMORY_LIMIT",
-      "displayName": "Memory limit",
-      "description": "Maximum amount of memory the container can use",
+      "displayName": "Memory Limit",
+      "description": "Maximum amount of memory the container can use.",
       "value": "512Mi"
     },
+    {
+      "name": "NAMESPACE",
+      "displayName": "Namespace",
+      "description": "The OpenShift Namespace where the ImageStream resides.",
+      "value": "openshift"
+    },
     {
       "name": "JENKINS_SERVICE_NAME",
-      "displayName": "Jenkins service name",
-      "description": "The name of the OpenShift Service exposed for the Jenkins container",
+      "displayName": "Jenkins Service Name",
+      "description": "The name of the OpenShift Service exposed for the Jenkins container.",
       "value": "jenkins"
     },
     {
       "name": "JENKINS_PASSWORD",
-      "displayName": "Jenkins password",
-      "description": "Password for the Jenkins user",
+      "displayName": "Jenkins Password",
+      "description": "Password for the Jenkins user.",
       "generate": "expression",
       "value": "password"
     },
     {
       "name": "VOLUME_CAPACITY",
-      "displayName": "Volume capacity",
-      "description": "Volume space available for data, e.g. 512Mi, 2Gi",
+      "displayName": "Volume Capacity",
+      "description": "Volume space available for data, e.g. 512Mi, 2Gi.",
       "value": "512Mi",
       "required": true
     }
-- 
cgit v1.2.3