summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-10-23 20:45:27 -0400
committerGitHub <noreply@github.com>2017-10-23 20:45:27 -0400
commitd3ae358d8eda7d74a158d9ff7de3a23fca4e8b51 (patch)
tree772dbe7a3c713308f37f77ac60680605a19a90ef /playbooks
parentb9ddd26431a1c5be0b9f289bf5606796e548aaed (diff)
parent2a8af5f9f853dfc7cc0058e9a29d2149d5277d95 (diff)
downloadopenshift-d3ae358d8eda7d74a158d9ff7de3a23fca4e8b51.tar.gz
openshift-d3ae358d8eda7d74a158d9ff7de3a23fca4e8b51.tar.bz2
openshift-d3ae358d8eda7d74a158d9ff7de3a23fca4e8b51.tar.xz
openshift-d3ae358d8eda7d74a158d9ff7de3a23fca4e8b51.zip
Merge pull request #5569 from ganhuang/all-hosts-no-proxy
Generate internal hostnames of no_proxy
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-cluster/initialize_facts.yml14
1 files changed, 13 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_facts.yml b/playbooks/common/openshift-cluster/initialize_facts.yml
index be2f8b5f4..0f563adb7 100644
--- a/playbooks/common/openshift-cluster/initialize_facts.yml
+++ b/playbooks/common/openshift-cluster/initialize_facts.yml
@@ -145,7 +145,19 @@
https_proxy: "{{ openshift_https_proxy | default(None) }}"
no_proxy: "{{ openshift_no_proxy | default(None) }}"
generate_no_proxy_hosts: "{{ openshift_generate_no_proxy_hosts | default(True) }}"
- no_proxy_internal_hostnames: "{{ openshift_no_proxy_internal_hostnames | default(None) }}"
+
+ - name: Set fact of no_proxy_internal_hostnames
+ openshift_facts:
+ role: common
+ local_facts:
+ no_proxy_internal_hostnames: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config']
+ | union(groups['oo_masters_to_config'])
+ | union(groups['oo_etcd_to_config'] | default([])))
+ | oo_collect('openshift.common.hostname') | default([]) | join (',')
+ }}"
+ when:
+ - openshift_http_proxy is defined or openshift_https_proxy is defined
+ - openshift_generate_no_proxy_hosts | default(True) | bool
- name: initialize_facts set_fact repoquery command
set_fact: