summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-06-09 16:34:47 -0400
committerGitHub <noreply@github.com>2016-06-09 16:34:47 -0400
commitfea08b9ba213b69667e103ff9dfd4383218e9eac (patch)
tree433bf1f2d0846073949c6191bb8fc5f40761d20c
parente487db6d41f397bcc371059dea7ca97d89ccfee2 (diff)
parent2d015f6197162da0b851a888cce5813aa056269e (diff)
downloadopenshift-fea08b9ba213b69667e103ff9dfd4383218e9eac.tar.gz
openshift-fea08b9ba213b69667e103ff9dfd4383218e9eac.tar.bz2
openshift-fea08b9ba213b69667e103ff9dfd4383218e9eac.tar.xz
openshift-fea08b9ba213b69667e103ff9dfd4383218e9eac.zip
Merge pull request #2007 from bachp/lowercase-proxy-vars
Add lower case proxy variables
-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