summaryrefslogtreecommitdiffstats
path: root/roles/openshift_builddefaults/vars
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-10 10:47:11 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-10 10:47:11 -0300
commitdb711081e6c1b2b676c212b0eeba95da9cb9f2c5 (patch)
treef7bb220893b9e76b4d6797e441ed50bf23d51166 /roles/openshift_builddefaults/vars
parent755a48c4ebf1061ce19892e5378fba769027bfc1 (diff)
parentfea08b9ba213b69667e103ff9dfd4383218e9eac (diff)
downloadopenshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.gz
openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.bz2
openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.xz
openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.zip
Merge branch 'master' into upgrade33
Diffstat (limited to 'roles/openshift_builddefaults/vars')
-rw-r--r--roles/openshift_builddefaults/vars/main.yml6
1 files changed, 6 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(',') }}"