diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-20 16:05:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 16:05:04 -0400 |
| commit | 4313ad4b3d5dad85d1016d64cc558a749919c563 (patch) | |
| tree | ef6d16136f4606503c40410524fb6a08b9b32c74 /roles/openshift_facts | |
| parent | 8b23cf0b83273bdb4cc75c583cb2f5bbeab26e22 (diff) | |
| parent | 4058f70c2969b4c9c8485be682fe872b5a3a0d64 (diff) | |
| download | openshift-4313ad4b3d5dad85d1016d64cc558a749919c563.tar.gz openshift-4313ad4b3d5dad85d1016d64cc558a749919c563.tar.bz2 openshift-4313ad4b3d5dad85d1016d64cc558a749919c563.tar.xz openshift-4313ad4b3d5dad85d1016d64cc558a749919c563.zip | |
Merge pull request #2476 from sdodson/split_builddefaults_no_proxy
Split openshift_builddefaults_no_proxy if it's not a list
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 3 |
1 files changed, 3 insertions, 0 deletions
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: |