commit 4386a0757c6cdebed6a7642fd0571bd9d85e0773
author Dennis Dmitriev <ddmitriev@mirantis.com> Mon Sep 04 13:58:02 2017 +0300
committer Dennis Dmitriev <dis.xcom@gmail.com> Mon Sep 04 07:28:53 2017 -0400
tree d795617b84d6df608b57a10df88593877319e564
parent eea5bb34bafb6df58be84d7534502c855344ba6f

Compatibility for changed option in salt-formula-reclass

in 0.2+20170801 : reclass.validate_node_params
in 0.2+20170901 : reclass.validate_pillar

Change-Id: Icb5ca2617c91f7d58615ddeb889031a3c87cbe17
Reviewed-on: https://review.gerrithub.io/377008
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>

tcp_tests/templates/shared-salt.yaml

diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 9d98bf6..a101ce8 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -357,7 +357,11 @@
   skip_fail: false
 
 - description: Show reclass-salt --top for all generated nodes
-  cmd: salt-call reclass.validate_nodes_params && reclass-salt --top
+  cmd: |
+    set -e
+    if salt-call sys.doc reclass.validate_node_params | grep -q reclass.validate_node_params ; then salt-call reclass.validate_nodes_params ; fi
+    if salt-call sys.doc reclass.validate_pillar | grep -q reclass.validate_pillar ; then salt-call reclass.validate_pillar ; fi
+    reclass-salt --top
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 5}
   skip_fail: false