summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v1.2/quickstart-templates/jenkins-persistent-template.json
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-05-13 14:34:55 -0400
committerScott Dodson <sdodson@redhat.com>2016-05-16 13:02:06 -0400
commitcbb5bf9b596bd63ee23a803ddb9bb018d0f985de (patch)
tree7e90cf98f058c0a6e2926698f893e29f8a22fd09 /roles/openshift_examples/files/examples/v1.2/quickstart-templates/jenkins-persistent-template.json
parent6600c694bedf88a246c0f8a2cccb9ae3c34dc6ea (diff)
downloadopenshift-cbb5bf9b596bd63ee23a803ddb9bb018d0f985de.tar.gz
openshift-cbb5bf9b596bd63ee23a803ddb9bb018d0f985de.tar.bz2
openshift-cbb5bf9b596bd63ee23a803ddb9bb018d0f985de.tar.xz
openshift-cbb5bf9b596bd63ee23a803ddb9bb018d0f985de.zip
Sync latest content
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.2/quickstart-templates/jenkins-persistent-template.json')
-rw-r--r--roles/openshift_examples/files/examples/v1.2/quickstart-templates/jenkins-persistent-template.json8
1 files changed, 4 insertions, 4 deletions
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 0d8dcffa1..ef04b4482 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
@@ -5,7 +5,7 @@
"name": "jenkins-persistent",
"creationTimestamp": null,
"annotations": {
- "description": "Jenkins service, with persistent storage. You must have persistent volumes available in your cluster to use this template.",
+ "description": "Jenkins service, with persistent storage.\nThe username is 'admin' and the tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.\nYou must have persistent volumes available in your cluster to use this template.",
"iconClass": "icon-jenkins",
"tags": "instant-app,jenkins"
}
@@ -119,7 +119,7 @@
"containers": [
{
"name": "jenkins",
- "image": "${JENKINS_IMAGE}",
+ "image": "JENKINS_IMAGE",
"readinessProbe": {
"timeoutSeconds": 3,
"initialDelaySeconds": 3,
@@ -130,7 +130,7 @@
},
"livenessProbe": {
"timeoutSeconds": 3,
- "initialDelaySeconds": 30,
+ "initialDelaySeconds": 60,
"httpGet": {
"path": "/login",
"port": 8080
@@ -199,7 +199,7 @@
{
"name": "JENKINS_PASSWORD",
"displayName": "Jenkins Password",
- "description": "Password for the Jenkins user.",
+ "description": "Password for the Jenkins 'admin' user.",
"generate": "expression",
"value": "password"
},