diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-01-23 16:08:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 16:08:20 -0600 |
| commit | 066494438d5baff9f555cd56a8bde94df148dc31 (patch) | |
| tree | e0c802a5af8dc07f0a16b5d41ebea55de4a34d06 /roles/openshift_examples/files | |
| parent | d740fd159416783c88839e6e2c2e150eb81b67da (diff) | |
| parent | c2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d (diff) | |
| download | openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.gz openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.bz2 openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.xz openshift-066494438d5baff9f555cd56a8bde94df148dc31.zip | |
Merge branch 'master' into fix_logging_jks_gen
Diffstat (limited to 'roles/openshift_examples/files')
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.", |