summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-09-19 14:53:19 -0400
committerScott Dodson <sdodson@redhat.com>2017-09-20 18:13:34 -0400
commit531fb444c9bdc7a9c7aa0c174474f4993e8191db (patch)
treed33629506b0ee830833fa75534236889b5180abb /roles
parent457e0f80784820b9ff0fb6a7407c271731f5b1d9 (diff)
downloadopenshift-531fb444c9bdc7a9c7aa0c174474f4993e8191db.tar.gz
openshift-531fb444c9bdc7a9c7aa0c174474f4993e8191db.tar.bz2
openshift-531fb444c9bdc7a9c7aa0c174474f4993e8191db.tar.xz
openshift-531fb444c9bdc7a9c7aa0c174474f4993e8191db.zip
Default openshift_pkg_version to full version-release during upgrades
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1490677 The versioning scheme for 3.7 pre-releases has changed and now all versions are 3.7.0 and the release is incremented on builds, ie: 3.7.0-0.124.0 upgraded to 3.7.0-0.125.0. If we know we're an upgrade and they haven't requested a specific package version defer the defaulting of openshift_pkg_version until the upgrade playbooks and there set it to the available version including the release.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_version/tasks/main.yml9
1 files changed, 7 insertions, 2 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml
index 1ff99adf8..f4e9ff43a 100644
--- a/roles/openshift_version/tasks/main.yml
+++ b/roles/openshift_version/tasks/main.yml
@@ -166,7 +166,9 @@
- set_fact:
openshift_pkg_version: -{{ openshift_version }}
- when: openshift_pkg_version is not defined
+ when:
+ - openshift_pkg_version is not defined
+ - openshift_upgrade_target is not defined
- fail:
msg: openshift_version role was unable to set openshift_version
@@ -181,7 +183,10 @@
- fail:
msg: openshift_version role was unable to set openshift_pkg_version
name: Abort if openshift_pkg_version was not set
- when: openshift_pkg_version is not defined
+ when:
+ - openshift_pkg_version is not defined
+ - openshift_upgrade_target is not defined
+
- fail:
msg: "No OpenShift version available; please ensure your systems are fully registered and have access to appropriate yum repositories."