summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-09-01 14:29:52 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-09-28 11:57:54 -0300
commitd5545fbc68f0f398c727065faf835faca68e1fc0 (patch)
tree1cf60c86d5d405aa107c70779972a52afe9a6ea6
parent2a830f458e6512c3b6305934a650ba23d234a8ac (diff)
downloadopenshift-d5545fbc68f0f398c727065faf835faca68e1fc0.tar.gz
openshift-d5545fbc68f0f398c727065faf835faca68e1fc0.tar.bz2
openshift-d5545fbc68f0f398c727065faf835faca68e1fc0.tar.xz
openshift-d5545fbc68f0f398c727065faf835faca68e1fc0.zip
Stop guarding against pacemaker in upgrade, no longer necessary.
-rw-r--r--playbooks/common/openshift-cluster/upgrades/pre.yml8
1 files changed, 0 insertions, 8 deletions
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