diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-26 09:17:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 09:17:31 -0500 |
| commit | 824e3a669e4683c3baf94d8f9eee168bc68afcb1 (patch) | |
| tree | 67f104050de377ed852795ac1dc4b856de582f52 /roles/openshift_master/templates | |
| parent | 7f1f05d90b4f6032629cf1a08e8f4139093f0f0b (diff) | |
| parent | cd2690c5fd83719c5abba0220c58acc584210a7f (diff) | |
| download | openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.tar.gz openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.tar.bz2 openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.tar.xz openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.zip | |
Merge pull request #3182 from abutcher/no-proxy-list
Comma separate no_proxy host list in openshift_facts
Diffstat (limited to 'roles/openshift_master/templates')
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2 index 7aea89578..6e2439fd9 100644 --- a/roles/openshift_master/templates/atomic-openshift-master.j2 +++ b/roles/openshift_master/templates/atomic-openshift-master.j2 @@ -29,7 +29,7 @@ HTTP_PROXY={{ openshift.common.http_proxy | default('') }} HTTPS_PROXY={{ openshift.common.https_proxy | default('')}} {% endif %} {% if 'no_proxy' in openshift.common %} -NO_PROXY={{ openshift.common.no_proxy | default('') | join(',') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }} +NO_PROXY={{ openshift.common.no_proxy | default('') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }} {% endif %} {% if not ('https_proxy' in openshift.common or 'https_proxy' in openshift.common or 'no_proxy' in openshift.common) %} {% for item in master_proxy %} diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 index 43fb3cafa..c484d23cc 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 @@ -24,5 +24,5 @@ HTTP_PROXY={{ openshift.common.http_proxy | default('') }} HTTPS_PROXY={{ openshift.common.https_proxy | default('')}} {% endif %} {% if 'no_proxy' in openshift.common %} -NO_PROXY={{ openshift.common.no_proxy | default('') | join(',') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }} +NO_PROXY={{ openshift.common.no_proxy | default('') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }} {% endif %} diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 index 6d26a69eb..e0adbbf52 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 @@ -24,5 +24,5 @@ HTTP_PROXY={{ openshift.common.http_proxy | default('') }} HTTPS_PROXY={{ openshift.common.https_proxy | default('')}} {% endif %} {% if 'no_proxy' in openshift.common %} -NO_PROXY={{ openshift.common.no_proxy | default('') | join(',') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }} +NO_PROXY={{ openshift.common.no_proxy | default('') }},{{ openshift.common.portal_net }},{{ openshift.master.sdn_cluster_network_cidr }} {% endif %} |