diff options
| author | gabemontero <gmontero@redhat.com> | 2017-01-20 08:46:19 -0500 | 
|---|---|---|
| committer | gabemontero <gmontero@redhat.com> | 2017-01-20 08:46:19 -0500 | 
| commit | 5c2e7967cc46424722a15a5b330d1d920d107c72 (patch) | |
| tree | 43fe6df0f2f36e223caf220d81458c0c1df4adb5 | |
| parent | c995e1273811a24211ccc8a7e31bd793728d0f74 (diff) | |
jenkins v1.3 templates should not enable oauth
2 files changed, 0 insertions, 28 deletions
| 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 @@ -98,14 +98,6 @@                  },                  "env": [                    { -                    "name": "OPENSHIFT_ENABLE_OAUTH", -                    "value": "${ENABLE_OAUTH}" -                  }, -                  { -                    "name": "OPENSHIFT_ENABLE_REDIRECT_PROMPT", -                    "value": "true" -                  }, -                  {                      "name": "KUBERNETES_MASTER",                      "value": "https://kubernetes.default:443"                    }, @@ -245,12 +237,6 @@        "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",        "description": "Maximum amount of memory the container can use.", 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 @@ -115,14 +115,6 @@                  },                  "env": [                    { -                    "name": "OPENSHIFT_ENABLE_OAUTH", -                    "value": "${ENABLE_OAUTH}" -                  }, -                  { -                    "name": "OPENSHIFT_ENABLE_REDIRECT_PROMPT", -                    "value": "true" -                  }, -                  {                      "name": "KUBERNETES_MASTER",                      "value": "https://kubernetes.default:443"                    }, @@ -262,12 +254,6 @@        "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",        "description": "Maximum amount of memory the container can use.", | 
