summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2016-06-09 10:26:58 +0200
committerPascal Bach <pascal.bach@siemens.com>2016-06-09 10:26:58 +0200
commit2d015f6197162da0b851a888cce5813aa056269e (patch)
tree01f4c790ec3a2206ef8bb2e0678a8115980ea2c6
parent1826e93bcf2ba21f0c1c7368dffd091a8bfbf142 (diff)
downloadopenshift-2d015f6197162da0b851a888cce5813aa056269e.tar.gz
openshift-2d015f6197162da0b851a888cce5813aa056269e.tar.bz2
openshift-2d015f6197162da0b851a888cce5813aa056269e.tar.xz
openshift-2d015f6197162da0b851a888cce5813aa056269e.zip
Add lower case proxy variables
Some applications expect the *_PROXY variables to be lower case. To support this too inject them in addition to the upper case ones. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Reviewed-by: Fabio Huser <fabio.huser@siemens.com>
-rw-r--r--roles/openshift_builddefaults/vars/main.yml6
-rw-r--r--roles/openshift_master_facts/vars/main.yml6
2 files changed, 12 insertions, 0 deletions
diff --git a/roles/openshift_builddefaults/vars/main.yml b/roles/openshift_builddefaults/vars/main.yml
index 9727c73a5..bcdf68112 100644
--- a/roles/openshift_builddefaults/vars/main.yml
+++ b/roles/openshift_builddefaults/vars/main.yml
@@ -13,3 +13,9 @@ builddefaults_yaml:
value: "{{ openshift.builddefaults.https_proxy | default('', true) }}"
- name: NO_PROXY
value: "{{ openshift.builddefaults.no_proxy | default('', true) | join(',') }}"
+ - name: http_proxy
+ value: "{{ openshift.builddefaults.http_proxy | default('', true) }}"
+ - name: https_proxy
+ value: "{{ openshift.builddefaults.https_proxy | default('', true) }}"
+ - name: no_proxy
+ value: "{{ openshift.builddefaults.no_proxy | default('', true) | join(',') }}"
diff --git a/roles/openshift_master_facts/vars/main.yml b/roles/openshift_master_facts/vars/main.yml
index 3b0ee2761..086d8340c 100644
--- a/roles/openshift_master_facts/vars/main.yml
+++ b/roles/openshift_master_facts/vars/main.yml
@@ -11,4 +11,10 @@ builddefaults_yaml:
- name: HTTPS_PROXY
value: "{{ openshift.master.builddefaults_https_proxy | default(omit, true) }}"
- name: NO_PROXY
+ value: "{{ openshift.master.builddefaults_no_proxy | default(omit, true) | join(',') }}"
+ - name: http_proxy
+ value: "{{ openshift.master.builddefaults_http_proxy | default(omit, true) }}"
+ - name: https_proxy
+ value: "{{ openshift.master.builddefaults_https_proxy | default(omit, true) }}"
+ - name: no_proxy
value: "{{ openshift.master.builddefaults_no_proxy | default(omit, true) | join(',') }}" \ No newline at end of file