From 2d015f6197162da0b851a888cce5813aa056269e Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@siemens.com>
Date: Thu, 9 Jun 2016 10:26:58 +0200
Subject: 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>
---
roles/openshift_builddefaults/vars/main.yml | 6 ++++++
roles/openshift_master_facts/vars/main.yml | 6 ++++++
2 files changed, 12 insertions(+)
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
--
cgit v1.2.3