Browse Source

Stop guarding against pacemaker in upgrade, no longer necessary.

Devan Goodwin 8 years ago
parent
commit
d5545fbc68
1 changed files with 0 additions and 8 deletions
  1. 0 8
      playbooks/common/openshift-cluster/upgrades/pre.yml

+ 0 - 8
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