diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-05 15:26:34 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-05 15:26:34 -0400 |
| commit | 91f92a3c7592b2d386b0d3f8a999e909c7d3d9f7 (patch) | |
| tree | ead2d2e995f0cbfd81d60c71c83cb952b50e5fc5 | |
| parent | 8429188ee24688eebf860a1872f8c6a0becee614 (diff) | |
| parent | 039dda58b3cd9b34abccf1f8f46eb825c1d45545 (diff) | |
| download | openshift-91f92a3c7592b2d386b0d3f8a999e909c7d3d9f7.tar.gz openshift-91f92a3c7592b2d386b0d3f8a999e909c7d3d9f7.tar.bz2 openshift-91f92a3c7592b2d386b0d3f8a999e909c7d3d9f7.tar.xz openshift-91f92a3c7592b2d386b0d3f8a999e909c7d3d9f7.zip | |
Merge pull request #1700 from brenton/32ha
Pacemaker is unsupported for 3.2
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_master_cluster/tasks/main.yml | 4 |
2 files changed, 11 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 abc0d81c7..dd938f058 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 @@ -25,6 +25,7 @@ hosts: oo_first_master vars: target_version: "{{ '1.2' if deployment_type == 'origin' else '3.1.1.900' }}" + g_pacemaker_upgrade_url_segment: "{{ 'org/latest' if deployment_type =='origin' else '.com/enterprise/3.1' }}" gather_facts: no tasks: - fail: @@ -35,6 +36,12 @@ - fail: msg: > + This upgrade does not support Pacemaker: + https://docs.openshift.{{ g_pacemaker_upgrade_url_segment }}/install_config/upgrading/pacemaker_to_native_ha.html + when: openshift.master.cluster_method == 'pacemaker' + + - fail: + msg: > openshift_pkg_version is {{ openshift_pkg_version }} which is not a valid version for a {{ target_version }} upgrade when: openshift_pkg_version is defined and openshift_pkg_version.split('-',1).1 | version_compare(target_version ,'<') diff --git a/roles/openshift_master_cluster/tasks/main.yml b/roles/openshift_master_cluster/tasks/main.yml index 40705d357..0543872c9 100644 --- a/roles/openshift_master_cluster/tasks/main.yml +++ b/roles/openshift_master_cluster/tasks/main.yml @@ -3,6 +3,10 @@ msg: "Not possible on atomic hosts for now" when: openshift.common.is_containerized | bool +- fail: + msg: "Pacemaker HA is unsupported on OpenShift Enterprise 3.2 and Origin 1.2" + when: openshift.master.cluster_method == "pacemaker" and openshift.common.version_gte_3_2_or_1_2 | bool + - name: Test if cluster is already configured command: pcs status register: pcs_status |