From fff666f3577b6e303ebec95930f25efad53e64b3 Mon Sep 17 00:00:00 2001
From: Vadim Rutkovsky <vrutkovs@redhat.com>
Date: Wed, 31 Jan 2018 16:28:37 +0100
Subject: upgrades: use openshift_version as a regexp when checking
openshift.common.version
This would fix errors like 'Master running 3.9.0 must be upgraded to
3.9* before node upgrade can be run' during the upgrade
Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
---
playbooks/common/openshift-cluster/upgrades/pre/config.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'playbooks/common')
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/config.yml b/playbooks/common/openshift-cluster/upgrades/pre/config.yml
index 2b27f8dd0..edc541ef9 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/config.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/config.yml
@@ -60,7 +60,7 @@
- fail: msg="Master running {{ openshift.common.version }} must be upgraded to {{ openshift_version }} before node upgrade can be run."
when:
- l_upgrade_nodes_only | default(False) | bool
- - openshift.common.version != openshift_version
+ - not openshift.common.version | match(openshift_version)
# If we're only upgrading nodes, skip this.
- import_playbook: ../../../../openshift-master/private/validate_restart.yml
--
cgit v1.2.3