summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-14 16:47:22 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-14 16:47:22 -0400
commit23460f961b1a26ed71a5738758088572c4bc6d5e (patch)
tree72122b2a026d453cbe4ad9d9d578bcf41a96b6a7 /playbooks
parent03e5be7ff92c662a7a8278ed2a13c5068855a187 (diff)
parent0bc0d679e2d014d3ff088f524916828618c82976 (diff)
downloadopenshift-23460f961b1a26ed71a5738758088572c4bc6d5e.tar.gz
openshift-23460f961b1a26ed71a5738758088572c4bc6d5e.tar.bz2
openshift-23460f961b1a26ed71a5738758088572c4bc6d5e.tar.xz
openshift-23460f961b1a26ed71a5738758088572c4bc6d5e.zip
Merge pull request #1597 from brenton/master
Bug 1316761 - Skip the available version check if openshift_image_tag…
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
index c9afca559..c564bf823 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
@@ -116,10 +116,9 @@
msg: This playbook requires Atomic Enterprise Platform/OpenShift Enterprise 3.1 or later
when: deployment_type == 'atomic-openshift' and g_aos_versions.curr_version | version_compare('3.1','<')
- # TODO: this may only make sense for RPM installs. We probably need another check for containerized installs.
- fail:
msg: Upgrade packages not found
- when: (g_aos_versions.avail_version | default(g_aos_versions.curr_version, true) | version_compare(target_version, '<'))
+ when: openshift_image_tag is not defined and (g_aos_versions.avail_version | default(g_aos_versions.curr_version, true) | version_compare(target_version, '<'))
- name: Determine available Docker
script: ../files/rpm_versions.sh docker