From 32d68afe4ab69c54a464b6fb2cc7893fd86aab2f Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Wed, 15 Mar 2017 15:44:05 +0100 Subject: don't assume openshift_upgrade_target is in a form d.d --- .../common/openshift-cluster/upgrades/pre/validate_excluder.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'playbooks/common/openshift-cluster/upgrades/pre') diff --git a/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml b/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml index 38d1cd0f8..6de1ed061 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml @@ -15,11 +15,15 @@ debug: msg: "{{ excluder }}: {{ excluder_version.stdout }}" + - name: Printing upgrade target version + debug: + msg: "{{ openshift_upgrade_target }}" + - name: Check the available {{ excluder }} version is at most of the upgrade target version fail: - msg: "Available {{ excluder }} version {{ excluder_version.stdout }} is higher than the upgrade target version {{ openshift_upgrade_target }}" + msg: "Available {{ excluder }} version {{ excluder_version.stdout }} is higher than the upgrade target version" when: - "{{ excluder_version.stdout != '' }}" - - "{{ excluder_version.stdout.split('.')[0:2] | join('.') | version_compare(openshift_upgrade_target, '>', strict=True) }}" + - "{{ excluder_version.stdout.split('.')[0:2] | join('.') | version_compare(openshift_upgrade_target.split('.')[0:2] | join('.'), '>', strict=True) }}" when: - not openshift.common.is_atomic | bool -- cgit v1.2.1