summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-14 16:47:55 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-14 16:48:02 -0300
commit61bb9c087b69521c6b93f93913b052893ca61d75 (patch)
tree8d028679c641cc4ef7e2192f02afd423e2b2263b /playbooks/common/openshift-cluster/upgrades
parentfea08b9ba213b69667e103ff9dfd4383218e9eac (diff)
downloadopenshift-61bb9c087b69521c6b93f93913b052893ca61d75.tar.gz
openshift-61bb9c087b69521c6b93f93913b052893ca61d75.tar.bz2
openshift-61bb9c087b69521c6b93f93913b052893ca61d75.tar.xz
openshift-61bb9c087b69521c6b93f93913b052893ca61d75.zip
Fix no proxy hostnames during upgrade.
This value not being set was causing missing hostnames in the sysconfig files with NO_PROXY. This is not the same way we set it during config playbooks, they use vars definitions but this is too difficult in upgrade as there are too many roles that might need it set.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-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