Browse Source

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>
OpenShift Merge Robot 7 years ago
parent
commit
4fe88b0012
1 changed files with 1 additions and 1 deletions
  1. 1 1
      playbooks/common/openshift-cluster/upgrades/pre/config.yml

+ 1 - 1
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