diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-10 10:47:11 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-10 10:47:11 -0300 |
| commit | db711081e6c1b2b676c212b0eeba95da9cb9f2c5 (patch) | |
| tree | f7bb220893b9e76b4d6797e441ed50bf23d51166 /roles/openshift_master_facts/vars/main.yml | |
| parent | 755a48c4ebf1061ce19892e5378fba769027bfc1 (diff) | |
| parent | fea08b9ba213b69667e103ff9dfd4383218e9eac (diff) | |
| download | openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.gz openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.bz2 openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.tar.xz openshift-db711081e6c1b2b676c212b0eeba95da9cb9f2c5.zip | |
Merge branch 'master' into upgrade33
Diffstat (limited to 'roles/openshift_master_facts/vars/main.yml')
| -rw-r--r-- | roles/openshift_master_facts/vars/main.yml | 6 |
1 files changed, 6 insertions, 0 deletions
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 |