From 4058f70c2969b4c9c8485be682fe872b5a3a0d64 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Tue, 20 Sep 2016 15:27:44 -0400 Subject: Split openshift_builddefaults_no_proxy if it's not a list --- roles/openshift_facts/library/openshift_facts.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'roles/openshift_facts') diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index bdc7d3947..7182ac627 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1433,6 +1433,9 @@ def set_proxy_facts(facts): builddefaults['http_proxy'] = common['http_proxy'] if 'https_proxy' not in builddefaults and 'https_proxy' in common: builddefaults['https_proxy'] = common['https_proxy'] + # make no_proxy into a list if it's not + if 'no_proxy' in builddefaults and isinstance(builddefaults['no_proxy'], basestring): + builddefaults['no_proxy'] = builddefaults['no_proxy'].split(",") if 'no_proxy' not in builddefaults and 'no_proxy' in common: builddefaults['no_proxy'] = common['no_proxy'] if 'git_http_proxy' not in builddefaults and 'http_proxy' in builddefaults: -- cgit v1.2.3