From 0004d0be1bd5fe902379aa1b1fef0903dced4326 Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Thu, 20 Jul 2017 11:02:37 -0400 Subject: If proxy in effect, add etcd host IP addresses to NO_PROXY list on masters Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1466783 --- roles/openshift_facts/library/openshift_facts.py | 7 +++++++ 1 file changed, 7 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 4712ca3a8..49cc51b48 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1647,6 +1647,13 @@ def set_proxy_facts(facts): common['no_proxy'] = common['no_proxy'].split(",") elif 'no_proxy' not in common: common['no_proxy'] = [] + + # See https://bugzilla.redhat.com/show_bug.cgi?id=1466783 + # masters behind a proxy need to connect to etcd via IP + if 'no_proxy_etcd_host_ips' in common: + if isinstance(common['no_proxy_etcd_host_ips'], string_types): + common['no_proxy'].extend(common['no_proxy_etcd_host_ips'].split(',')) + if 'generate_no_proxy_hosts' in common and safe_get_bool(common['generate_no_proxy_hosts']): if 'no_proxy_internal_hostnames' in common: common['no_proxy'].extend(common['no_proxy_internal_hostnames'].split(',')) -- cgit v1.2.1