summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-09 10:25:45 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-09 10:25:45 -0400
commiteba9772a02c1c228c2720e7c298c30c7dc078049 (patch)
tree7488c52cee9d741558fd12a54366363c38b0fbe7 /playbooks/adhoc
parent334c20584080abaaee9551b25a0efed1526e5e72 (diff)
downloadopenshift-eba9772a02c1c228c2720e7c298c30c7dc078049.tar.gz
openshift-eba9772a02c1c228c2720e7c298c30c7dc078049.tar.bz2
openshift-eba9772a02c1c228c2720e7c298c30c7dc078049.tar.xz
openshift-eba9772a02c1c228c2720e7c298c30c7dc078049.zip
Remove upgrade playbook restriction on 3.0.2.
This is blocking 3.0.1 upgrades to 3.1 incorrectly, which is a scenario we should support.
Diffstat (limited to 'playbooks/adhoc')
-rw-r--r--playbooks/adhoc/upgrades/upgrade.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 1b6b5757c..42fbd3cf8 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -120,10 +120,7 @@
msg: This playbook requires Origin 1.0.6 or later
when: deployment_type == 'origin' and g_aos_versions.curr_version | version_compare('1.0.6','<')
- - fail:
- msg: This playbook requires Atomic OpenShift 3.0.2 or later
- when: deployment_type in ['openshift-enterprise', 'atomic-openshift'] and g_aos_versions.curr_version | version_compare('3.0.2','<')
-
+ # TODO: This should be specific to the 3.1 upgrade playbook (coming in future refactor), otherwise we are blocking 3.0.1 to 3.0.2 here.
- fail:
msg: Atomic OpenShift 3.1 packages not found
when: deployment_type in ['openshift-enterprise', 'atomic-openshift'] and g_aos_versions.curr_version | version_compare('3.0.2.900','<') and (g_aos_versions.avail_version is none or g_aos_versions.avail_version | version_compare('3.0.2.900','<'))