summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-06-14 17:10:50 -0400
committerGitHub <noreply@github.com>2016-06-14 17:10:50 -0400
commitb4bec9f464a6b4e4937ddd9204e2d716b699a86c (patch)
tree3361a9f0c8f8650780206bab4ad11bc52a31e851 /playbooks/common/openshift-cluster
parentd93c300e168788b7d667be8736c13d74659ab10f (diff)
parent61bb9c087b69521c6b93f93913b052893ca61d75 (diff)
downloadopenshift-b4bec9f464a6b4e4937ddd9204e2d716b699a86c.tar.gz
openshift-b4bec9f464a6b4e4937ddd9204e2d716b699a86c.tar.bz2
openshift-b4bec9f464a6b4e4937ddd9204e2d716b699a86c.tar.xz
openshift-b4bec9f464a6b4e4937ddd9204e2d716b699a86c.zip
Merge pull request #2041 from dgoodwin/no-proxy-hostnames
Fix no proxy hostnames during upgrade.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml12
1 files changed, 12 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
index 6bff16674..27b3ece96 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
@@ -8,6 +8,18 @@
- openshift_facts
- openshift_repos
+- name: Set openshift_no_proxy_internal_hostnames
+ hosts: oo_masters_to_config:oo_nodes_to_config
+ tasks:
+ - set_fact:
+ openshift_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) and
+ openshift_generate_no_proxy_hosts | default(True) | bool }}"
+
- name: Evaluate additional groups for upgrade
hosts: localhost
connection: local