summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-03-24 16:42:34 -0400
committerScott Dodson <sdodson@redhat.com>2016-03-24 16:43:24 -0400
commitde133ff75c912c588dc05ac8b9f9b6a6d29a9f99 (patch)
tree99195eb1043ca9a61669b8af8a5074685030362f /roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
parent7c1c450f6bce04d3ad5caaefcd81d16c50f46415 (diff)
downloadopenshift-de133ff75c912c588dc05ac8b9f9b6a6d29a9f99.tar.gz
openshift-de133ff75c912c588dc05ac8b9f9b6a6d29a9f99.tar.bz2
openshift-de133ff75c912c588dc05ac8b9f9b6a6d29a9f99.tar.xz
openshift-de133ff75c912c588dc05ac8b9f9b6a6d29a9f99.zip
Sync latest db-templates and qucikstart-templates
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json')
-rw-r--r--roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json20
1 files changed, 13 insertions, 7 deletions
diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
index bbe6713ff..e464b5971 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/jenkins-ephemeral-template.json
@@ -78,7 +78,7 @@
"from": {
"kind": "ImageStreamTag",
"name": "jenkins:latest",
- "namespace": "openshift"
+ "namespace": "${NAMESPACE}"
},
"lastTriggeredImage": ""
}
@@ -163,20 +163,26 @@
"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"
}