summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
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_facts/library
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_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 78886dcea..5ca8879b3 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1641,7 +1641,7 @@ def set_proxy_facts(facts):
# We always add local dns domain and ourselves no matter what
common['no_proxy'].append('.' + common['dns_domain'])
common['no_proxy'].append(common['hostname'])
- common['no_proxy'] = sort_unique(common['no_proxy'])
+ common['no_proxy'] = ','.join(sort_unique(common['no_proxy']))
facts['common'] = common
return facts