From 94feef04f73d970bb6ec45afa3629e368e6c7df6 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 30 Jun 2017 11:27:03 -0400 Subject: Update v1.4 image streams and templates --- .../quickstart-templates/jenkins-persistent-template.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'roles/openshift_examples/files/examples/v1.4/quickstart-templates/jenkins-persistent-template.json') diff --git a/roles/openshift_examples/files/examples/v1.4/quickstart-templates/jenkins-persistent-template.json b/roles/openshift_examples/files/examples/v1.4/quickstart-templates/jenkins-persistent-template.json index a542de219..34b2b920b 100644 --- a/roles/openshift_examples/files/examples/v1.4/quickstart-templates/jenkins-persistent-template.json +++ b/roles/openshift_examples/files/examples/v1.4/quickstart-templates/jenkins-persistent-template.json @@ -22,7 +22,10 @@ "apiVersion": "v1", "metadata": { "name": "${JENKINS_SERVICE_NAME}", - "creationTimestamp": null + "creationTimestamp": null, + "annotations": { + "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" + } }, "spec": { "to": { @@ -126,6 +129,10 @@ "name": "OPENSHIFT_ENABLE_REDIRECT_PROMPT", "value": "true" }, + { + "name": "OPENSHIFT_JENKINS_JVM_ARCH", + "value": "${JVM_ARCH}" + }, { "name": "KUBERNETES_MASTER", "value": "https://kubernetes.default:443" @@ -271,6 +278,12 @@ "description": "Whether to enable OAuth OpenShift integration. If false, the static account 'admin' will be initialized with the password 'password'.", "value": "true" }, + { + "name": "JVM_ARCH", + "displayName": "Jenkins JVM Architecture", + "description": "Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.", + "value": "i386" + }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", -- cgit v1.2.3