From 67b364df0745ee6c5f744fca007152c44fd47e3b Mon Sep 17 00:00:00 2001
From: Brenton Leanhardt <bleanhar@redhat.com>
Date: Mon, 14 Mar 2016 13:39:39 -0400
Subject: Bug 1316761 - Skip the available version check if openshift_image_tag
is defined.
We already have a check in pre.yml to make sure openshift_image_tag is set to a
range that is allowed. This is an advanced setting and should be used to
override whatever is returned by the 'latest' image in a given registry.
---
playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'playbooks/common/openshift-cluster')
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
--
cgit v1.2.3