diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:39:39 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-14 13:43:19 -0400 |
| commit | 67b364df0745ee6c5f744fca007152c44fd47e3b (patch) | |
| tree | 35ffdbb336f2d587187f13a62839847624782038 | |
| parent | f4687e333679748341326e8d2fff38a8c93a7606 (diff) | |
| download | openshift-67b364df0745ee6c5f744fca007152c44fd47e3b.tar.gz openshift-67b364df0745ee6c5f744fca007152c44fd47e3b.tar.bz2 openshift-67b364df0745ee6c5f744fca007152c44fd47e3b.tar.xz openshift-67b364df0745ee6c5f744fca007152c44fd47e3b.zip | |
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.
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 3 |
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 |