diff options
| author | Vadim Rutkovsky <vrutkovs@redhat.com> | 2018-01-31 16:28:37 +0100 |
|---|---|---|
| committer | Vadim Rutkovsky <vrutkovs@redhat.com> | 2018-01-31 16:45:24 +0100 |
| commit | fff666f3577b6e303ebec95930f25efad53e64b3 (patch) | |
| tree | 1f94a5893d23302576b1f9f8c99bbb19da2d60fa | |
| parent | 26430dcbbbba6ac31e4f0380f12871c3e083c104 (diff) | |
| download | openshift-fff666f3577b6e303ebec95930f25efad53e64b3.tar.gz openshift-fff666f3577b6e303ebec95930f25efad53e64b3.tar.bz2 openshift-fff666f3577b6e303ebec95930f25efad53e64b3.tar.xz openshift-fff666f3577b6e303ebec95930f25efad53e64b3.zip | |
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>
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/config.yml | 2 |
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 |