summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-01-25 14:05:31 -0500
committerAndrew Butcher <abutcher@redhat.com>2017-01-25 14:27:12 -0500
commitcd2690c5fd83719c5abba0220c58acc584210a7f (patch)
treec50ecd9790215ac22f4b528884a0fc250c595cc7 /roles/openshift_node
parentd8fee0cc8441812cdd5e7aaae815adad7a9bbee7 (diff)
downloadopenshift-cd2690c5fd83719c5abba0220c58acc584210a7f.tar.gz
openshift-cd2690c5fd83719c5abba0220c58acc584210a7f.tar.bz2
openshift-cd2690c5fd83719c5abba0220c58acc584210a7f.tar.xz
openshift-cd2690c5fd83719c5abba0220c58acc584210a7f.zip
Comma separate no_proxy host list in openshift_facts so that it appears as a string everywhere it is used.
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/tasks/systemd_units.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index 626c47387..5243a87fe 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -90,7 +90,7 @@
- regex: '^HTTPS_PROXY='
line: "HTTPS_PROXY={{ openshift.common.https_proxy | default('') }}"
- regex: '^NO_PROXY='
- line: "NO_PROXY={{ openshift.common.no_proxy | default([]) | join(',') }},{{ openshift.common.portal_net }},{{ hostvars[groups.oo_first_master.0].openshift.master.sdn_cluster_network_cidr }}"
+ line: "NO_PROXY={{ openshift.common.no_proxy | default([]) }},{{ openshift.common.portal_net }},{{ hostvars[groups.oo_first_master.0].openshift.master.sdn_cluster_network_cidr }}"
when: ('http_proxy' in openshift.common and openshift.common.http_proxy != '')
notify:
- restart node