From d5545fbc68f0f398c727065faf835faca68e1fc0 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Thu, 1 Sep 2016 14:29:52 -0300 Subject: Stop guarding against pacemaker in upgrade, no longer necessary. --- playbooks/common/openshift-cluster/upgrades/pre.yml | 8 -------- 1 file changed, 8 deletions(-) (limited to 'playbooks') diff --git a/playbooks/common/openshift-cluster/upgrades/pre.yml b/playbooks/common/openshift-cluster/upgrades/pre.yml index 13f6471b5..3a134c802 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre.yml @@ -38,8 +38,6 @@ ############################################################################### - name: Verify upgrade can proceed on first master hosts: oo_first_master - vars: - g_pacemaker_upgrade_url_segment: "{{ 'org/latest' if deployment_type =='origin' else '.com/enterprise/3.1' }}" gather_facts: no tasks: - fail: @@ -48,12 +46,6 @@ deployment types when: deployment_type not in ['atomic-enterprise', 'origin','openshift-enterprise', 'online'] - - 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 is defined and openshift.master.cluster_method == 'pacemaker' - # Error out in situations where the user has older versions specified in their # inventory in any of the openshift_release, openshift_image_tag, and # openshift_pkg_version variables. These must be removed or updated to proceed -- cgit v1.2.3