Introduce SALT_VERSION var
As we plan to move to salt 2017.7 and at the same time
we need to check 2016.3 as well (and upgrdae path), introduce
new var SALT_VERSION with default value 2016.3
Also update repo path to salt from mirror mirantis and clened up
commented hacks
Reelated: PROD-19373
Change-Id: I3c327aa4b6369750f5bdabe1b96cb52ab5770f03
diff --git a/tcp_tests/templates/cookied-bm-ocata-cicd-pipeline/salt.yaml b/tcp_tests/templates/cookied-bm-ocata-cicd-pipeline/salt.yaml
index 0d2bdda..8bdd414 100644
--- a/tcp_tests/templates/cookied-bm-ocata-cicd-pipeline/salt.yaml
+++ b/tcp_tests/templates/cookied-bm-ocata-cicd-pipeline/salt.yaml
@@ -129,3 +129,7 @@
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
+
+{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
+
+{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}