diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-23 10:40:58 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-23 10:40:58 -0300 |
| commit | b85c47761db579b2153b08018ed74c7650b388f5 (patch) | |
| tree | 63fa53d0e3f9edada1b3b5aca43ac957f5c276d9 /playbooks/common/openshift-cluster | |
| parent | ea99abc4461f3e2edb7993b9c7961a13c727ab7c (diff) | |
| parent | 7ac20f9cef4dbbf9787e757dd1938d28483a22a7 (diff) | |
| download | openshift-b85c47761db579b2153b08018ed74c7650b388f5.tar.gz openshift-b85c47761db579b2153b08018ed74c7650b388f5.tar.bz2 openshift-b85c47761db579b2153b08018ed74c7650b388f5.tar.xz openshift-b85c47761db579b2153b08018ed74c7650b388f5.zip | |
Merge branch 'master' into upgrade33
Diffstat (limited to 'playbooks/common/openshift-cluster')
3 files changed, 14 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index ebddc7841..a34322754 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-cluster/additional_config.yml @@ -17,6 +17,7 @@ - role: openshift_master_cluster when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker" - role: openshift_examples + registry_url: "{{ openshift.master.registry_url }}" when: openshift.common.install_examples | bool - role: openshift_cluster_metrics when: openshift.common.use_cluster_metrics | bool 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 d52fd7cb0..ccf9514f1 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 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 cdc691829..6a3d60276 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 @@ -10,6 +10,18 @@ roles: - 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 |