summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-09 15:07:45 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-09 15:07:45 -0500
commit34fcfa446a871cfdf268153de7682d7fd909cbda (patch)
tree92a683efec96d86d3b2bf8fd6121eb8c6e6b2e17 /playbooks/adhoc
parentf5d81c39b80bdc3f48e5552bba0d52a42f54617c (diff)
parenteba9772a02c1c228c2720e7c298c30c7dc078049 (diff)
downloadopenshift-34fcfa446a871cfdf268153de7682d7fd909cbda.tar.gz
openshift-34fcfa446a871cfdf268153de7682d7fd909cbda.tar.bz2
openshift-34fcfa446a871cfdf268153de7682d7fd909cbda.tar.xz
openshift-34fcfa446a871cfdf268153de7682d7fd909cbda.zip
Merge pull request #848 from dgoodwin/drop-302-req
Remove upgrade playbook restriction on 3.0.2.
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 03b9193c0..7ce2698db 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','<'))