diff options
| author | Tim Bielawa <tbielawa@redhat.com> | 2017-07-20 11:02:37 -0400 |
|---|---|---|
| committer | Tim Bielawa <tbielawa@redhat.com> | 2017-07-21 14:36:53 -0400 |
| commit | 0004d0be1bd5fe902379aa1b1fef0903dced4326 (patch) | |
| tree | d422a7dc714c4a756717470cc3db1358e964958f | |
| parent | 87689f890bb6d015f6c07e227174dc7c4172766e (diff) | |
| download | openshift-0004d0be1bd5fe902379aa1b1fef0903dced4326.tar.gz openshift-0004d0be1bd5fe902379aa1b1fef0903dced4326.tar.bz2 openshift-0004d0be1bd5fe902379aa1b1fef0903dced4326.tar.xz openshift-0004d0be1bd5fe902379aa1b1fef0903dced4326.zip | |
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
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 3 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 7 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 6 |
3 files changed, 16 insertions, 0 deletions
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 }}" 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(',')) diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 9b7125240..c643c6c46 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -140,6 +140,12 @@ - set_fact: openshift_push_via_dns: "{{ (openshift_use_dnsmasq | default(true) and openshift.common.version_gte_3_6) or (already_set.stdout | match('OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000')) }}" +- name: Set fact of all etcd host IPs + openshift_facts: + role: common + local_facts: + no_proxy_etcd_host_ips: "{{ openshift_no_proxy_etcd_host_ips }}" + - name: Install the systemd units include: systemd_units.yml |