commit 7fa4ffef2ee90714165be1313de0534f8fecde61
author Sergii Golovatiuk <sgolovatiuk@mirantis.com> Thu Aug 03 11:05:36 2017 +0200
committer Dennis Dmitriev <dis.xcom@gmail.com> Thu Aug 03 10:31:54 2017 -0400
tree c64bc1ace07a1c50c4cfe15abd475322d4329846
parent 87f8eb6230537aaef8554b08536b45dddf49204d

Modify salt.yaml in accordance with other templates

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

tcp_tests/templates/virtual-mcp10-contrail/salt.yaml

diff --git a/tcp_tests/templates/virtual-mcp10-contrail/salt.yaml b/tcp_tests/templates/virtual-mcp10-contrail/salt.yaml
index c2835e5..4535c6b 100644
--- a/tcp_tests/templates/virtual-mcp10-contrail/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp10-contrail/salt.yaml
@@ -97,6 +97,8 @@
           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
@@ -149,8 +151,8 @@
     EOF
     eatmydata apt-get install -y salt-minion;
     echo "Check for system info and metadata availability ...";
-    salt-call --no-color grains.items;
-    salt-call --no-color pillar.items;
+    salt-call --hard-crash --no-color grains.items;
+    salt-call --hard-crash --no-color pillar.items;
   node_name: {{ ssh['node_name'] }}
   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
@@ -196,7 +198,7 @@
   skip_fail: false
 
 - description: Run 'salt.master' formula on cfg01
-  cmd: timeout 120 salt --hard-crash --state-output=mixed --state-verbose=False
+  cmd: timeout 120 salt --timeout=120 --hard-crash --state-output=mixed --state-verbose=False
     -C 'I@salt:master' state.sls salt.master;
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 2, delay: 5}
@@ -235,8 +237,7 @@
   skip_fail: false
 
 - description: Configure minion on master
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@salt:master' state.sls 'salt.minion'
+  cmd: salt-call --hard-crash --no-color state.sls 'salt.minion'
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 3, delay: 10}
   skip_fail: false
@@ -264,14 +265,14 @@
   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