From 61bb9c087b69521c6b93f93913b052893ca61d75 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Tue, 14 Jun 2016 16:47:55 -0300 Subject: 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. --- .../common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2') 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 -- cgit v1.2.3 From ed28e9a5929aaa305d5d9db38da96887184b3338 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 19 May 2016 11:17:32 -0400 Subject: If registry_url != registry.access.redhat.com then modify image streams --- playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml index 31e76805c..c16965a35 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/post.yml @@ -19,6 +19,7 @@ - openshift_examples # Update the existing templates - role: openshift_examples + registry_url: "{{ openshift.master.registry_url }}" openshift_examples_import_command: replace pre_tasks: - name: Collect all routers -- cgit v1.2.3