Merge branch 'bugfix/GH-2551-fix-downgrade-pre-check' into tmp/octopu…

…s/w/2.1/bugfix/GH-2551-fix-downgrade-pre-check
scality · May 18, 2020 · 38c0e8c · 38c0e8c
2 parents 7219368 + 41a3583
commit 38c0e8c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/metalk8s/orchestrate/downgrade/precheck.sls b/salt/metalk8s/orchestrate/downgrade/precheck.sls
@@ -4,7 +4,7 @@
 {%- set nodes_versions = pillar.metalk8s.nodes.values() | map(attribute='version') | list %}
 {%- do nodes_versions.sort(cmp=salt.pkg.version_cmp, reverse=True) %}
 {%- set expected = nodes_versions | first %}
-{%- if saltenv != 'metalk8s-' ~  expected %}
+{%- if salt.pkg.version_cmp(saltenv | replace('metalk8s-', ''), expected) >= 0 %}
 
 Invalid saltenv "{{ saltenv }}" consider using "metalk8s-{{ expected }}":
   test.fail_without_changes