commit 01e3a2dd7a75cbc78a1a7b6152a5f9f2f7b5414a
author Sergii Golovatiuk <sgolovatiuk@mirantis.com> Wed Aug 02 11:28:26 2017 +0200
committer Dennis Dmitriev <dis.xcom@gmail.com> Thu Aug 03 10:32:21 2017 -0400
tree 7907bdff31226a2052eddf558a0f5ce3974ce463
parent 7fa4ffef2ee90714165be1313de0534f8fecde61

Fix deployments after changes in salt-formula-salt

We don't need to hack deployment anymore. This patch removes workarounds
that were required to make a deployments.

Change-Id: Ieead7c73173ebbf7a97d209afb623185c02f3f26
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
Reviewed-on: https://review.gerrithub.io/372233
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>

tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml

diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml
index 9fd06cf..be86850 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/salt.yaml
@@ -91,12 +91,14 @@
     # Disable checkouting the model from remote repository
     cat << 'EOF' >> /srv/salt/reclass/nodes/{{ HOSTNAME_CFG01 }}.yml
     # local storage
-    reclass:
-      storage:
-        data_source:
-          engine: local
+      reclass:
+        storage:
+          data_source:
+            engine: local
     EOF
 
+    # Show the changes to the console
+    cd /srv/salt/reclass/; git diff
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 1}
   skip_fail: false
@@ -175,7 +177,7 @@
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
     -C 'I@salt:master' state.sls linux;
   node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
+  retry: {count: 2, delay: 5}
   skip_fail: false
 
 - description: Run 'openssh' formula on cfg01
@@ -260,17 +262,17 @@
   skip_fail: false
 
 - description: Configure salt.minion on all nodes
-  cmd: salt --timeout=120 --hard-crash --state-output=mixed --state-verbose=False
+  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
     -C 'I@linux:system' state.sls salt.minion
   node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
+  retry: {count: 2, delay: 5}
   skip_fail: false
 
 - description: Configure ntp and rsyslog on nodes
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
     -C 'I@linux:system' state.sls ntp,rsyslog
   node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 10}
+  retry: {count: 2, delay: 10}
   skip_fail: false
 
 - description: Check salt minion versions on slaves