From 5c2e7967cc46424722a15a5b330d1d920d107c72 Mon Sep 17 00:00:00 2001 From: gabemontero Date: Fri, 20 Jan 2017 08:46:19 -0500 Subject: jenkins v1.3 templates should not enable oauth --- .../quickstart-templates/jenkins-ephemeral-template.json | 14 -------------- .../quickstart-templates/jenkins-persistent-template.json | 14 -------------- 2 files changed, 28 deletions(-) (limited to 'roles/openshift_examples') diff --git a/roles/openshift_examples/files/examples/v1.3/quickstart-templates/jenkins-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.3/quickstart-templates/jenkins-ephemeral-template.json index 62ccc5b7f..ab1c85b7e 100644 --- a/roles/openshift_examples/files/examples/v1.3/quickstart-templates/jenkins-ephemeral-template.json +++ b/roles/openshift_examples/files/examples/v1.3/quickstart-templates/jenkins-ephemeral-template.json @@ -97,14 +97,6 @@ } }, "env": [ - { - "name": "OPENSHIFT_ENABLE_OAUTH", - "value": "${ENABLE_OAUTH}" - }, - { - "name": "OPENSHIFT_ENABLE_REDIRECT_PROMPT", - "value": "true" - }, { "name": "KUBERNETES_MASTER", "value": "https://kubernetes.default:443" @@ -244,12 +236,6 @@ "description": "The name of the service used for master/slave communication.", "value": "jenkins-jnlp" }, - { - "name": "ENABLE_OAUTH", - "displayName": "Enable OAuth in Jenkins", - "description": "Whether to enable OAuth OpenShift integration. If false, the static account 'admin' will be initialized with the password 'password'.", - "value": "true" - }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", diff --git a/roles/openshift_examples/files/examples/v1.3/quickstart-templates/jenkins-persistent-template.json b/roles/openshift_examples/files/examples/v1.3/quickstart-templates/jenkins-persistent-template.json index 50c4ad566..87c439ad2 100644 --- a/roles/openshift_examples/files/examples/v1.3/quickstart-templates/jenkins-persistent-template.json +++ b/roles/openshift_examples/files/examples/v1.3/quickstart-templates/jenkins-persistent-template.json @@ -114,14 +114,6 @@ } }, "env": [ - { - "name": "OPENSHIFT_ENABLE_OAUTH", - "value": "${ENABLE_OAUTH}" - }, - { - "name": "OPENSHIFT_ENABLE_REDIRECT_PROMPT", - "value": "true" - }, { "name": "KUBERNETES_MASTER", "value": "https://kubernetes.default:443" @@ -261,12 +253,6 @@ "description": "The name of the service used for master/slave communication.", "value": "jenkins-jnlp" }, - { - "name": "ENABLE_OAUTH", - "displayName": "Enable OAuth in Jenkins", - "description": "Whether to enable OAuth OpenShift integration. If false, the static account 'admin' will be initialized with the password 'password'.", - "value": "true" - }, { "name": "MEMORY_LIMIT", "displayName": "Memory Limit", -- cgit v1.2.1