summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-10-24 12:39:56 +0200
committerGitHub <noreply@github.com>2017-10-24 12:39:56 +0200
commitd54942dac6551d59e19e9f9a0096ca4684b7079f (patch)
treeced22c2cf5e83106fc1ed48d3fba24e0a890702f /playbooks/common
parent2e751e6b408ff9e6f817df32542d84d62c901002 (diff)
parentf9e9056f2d8ba963c45e189344adddcb10ee5f3a (diff)
downloadopenshift-d54942dac6551d59e19e9f9a0096ca4684b7079f.tar.gz
openshift-d54942dac6551d59e19e9f9a0096ca4684b7079f.tar.bz2
openshift-d54942dac6551d59e19e9f9a0096ca4684b7079f.tar.xz
openshift-d54942dac6551d59e19e9f9a0096ca4684b7079f.zip
Merge pull request #5838 from ingvagabund/strip-dash-when-comparing-versions-python3
strip dash when comparing version with Python3
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
index 142ce5f3d..b9b3d323a 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
@@ -37,7 +37,7 @@
fail:
msg: "OpenShift {{ avail_openshift_version }} is available, but {{ openshift_upgrade_target }} or greater is required"
when:
- - openshift_pkg_version | default('0.0', True) | version_compare(openshift_release, '<')
+ - (openshift_pkg_version | default('-0.0', True)).split('-')[1] | version_compare(openshift_release, '<')
- name: Fail when openshift version does not meet minium requirement for Origin upgrade
fail: