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 --- playbooks/common/openshift-master/config.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'playbooks/common/openshift-master/config.yml') diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 7d3a371e3..fe6c1daa2 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -127,6 +127,9 @@ | union(groups['oo_etcd_to_config'] | default([]))) | oo_collect('openshift.common.hostname') | default([]) | join (',') }}" + openshift_no_proxy_etcd_host_ips: "{{ hostvars | oo_select_keys(groups['oo_etcd_to_config']) + | oo_collect('openshift.common.ip') | default([]) | join(',') + }}" roles: - role: openshift_master openshift_ca_host: "{{ groups.oo_first_master.0 }}" -- cgit v1.2.3 From 58b3a05fbea15efb6ee809e8e3b3b4a0cb977fab Mon Sep 17 00:00:00 2001 From: Tim Bielawa Date: Fri, 21 Jul 2017 14:33:41 -0400 Subject: Default an empty list for etcd_to_config if not there Also add filter names of filters that failed me for to their error messages so you can figure out which filter threw an exception when you're debugging log files. --- playbooks/common/openshift-master/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks/common/openshift-master/config.yml') diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index fe6c1daa2..5de03951c 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -127,7 +127,7 @@ | union(groups['oo_etcd_to_config'] | default([]))) | oo_collect('openshift.common.hostname') | default([]) | join (',') }}" - openshift_no_proxy_etcd_host_ips: "{{ hostvars | oo_select_keys(groups['oo_etcd_to_config']) + openshift_no_proxy_etcd_host_ips: "{{ hostvars | oo_select_keys(groups['oo_etcd_to_config'] | default([])) | oo_collect('openshift.common.ip') | default([]) | join(',') }}" roles: -- cgit v1.2.3