Browse Source

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.
Brenton Leanhardt 9 years ago
parent
commit
67b364df07
1 changed files with 1 additions and 2 deletions
  1. 1 2
      playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml

+ 1 - 2
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