summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-01 07:53:33 -0800
committerGitHub <noreply@github.com>2018-02-01 07:53:33 -0800
commit4fe88b001295566d49db1fe711870bf43c40c1ab (patch)
treea8fe1e427a1c4f8a937233fae32298c5ecaf3951 /playbooks
parent24f9b73bb9a6d6197a5028fe0d223c8823e2905e (diff)
parentfff666f3577b6e303ebec95930f25efad53e64b3 (diff)
downloadopenshift-4fe88b001295566d49db1fe711870bf43c40c1ab.tar.gz
openshift-4fe88b001295566d49db1fe711870bf43c40c1ab.tar.bz2
openshift-4fe88b001295566d49db1fe711870bf43c40c1ab.tar.xz
openshift-4fe88b001295566d49db1fe711870bf43c40c1ab.zip
Merge pull request #6955 from vrutkovs/upgrade-regex-version-match
Automatic merge from submit-queue. 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>
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/pre/config.yml2
1 files changed, 1 insertions, 1 deletions
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