commit c1e95c23fb893b326a3ba39f0e7e0be5fc67603e
author Dennis Dmitriev <ddmitriev@mirantis.com> Thu Mar 29 03:35:43 2018 +0300
committer Dennis Dmitriev <ddmitriev@mirantis.com> Fri Mar 30 01:24:49 2018 +0300
tree 4cdadd51cc96deb5957bd9b8ca75f13e819547c3
parent 38f368331f5d8a1daaed897636e3d0d15767be84

Fix cpu-mask from int to str

Change-Id: I9bf3c0f2deb67511fffdb27b9b887184e819cb97

tcp_tests/templates/cookied-mcp-pike-dpdk/salt.yaml

diff --git a/tcp_tests/templates/cookied-mcp-pike-dpdk/salt.yaml b/tcp_tests/templates/cookied-mcp-pike-dpdk/salt.yaml
index f23c660..ce48613 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dpdk/salt.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dpdk/salt.yaml
@@ -36,21 +36,29 @@
   retry: {count: 1, delay: 10}
   skip_fail: false
 
-- description: "Workaround for PROD-18833: Pre-install ovs packages and update alternatives to DPDK"
+- description: "Workaround for PROD-17975: Pre-install ovs packages to update alternatives to DPDK"
   cmd: |
     set -ex;
+    salt --hard-crash --state-output=mixed --state-verbose=False -C 'I@linux:system' state.sls linux.system.repo
     salt 'cmp*' cmd.run "apt-get install -y openvswitch-switch openvswitch-switch-dpdk";
-    salt 'cmp*' cmd.run "service openvswitch-switch stop"
-    salt 'cmp*' cmd.run "rm -f /var/lib/openvswitch/*"
-    salt 'cmp*' cmd.run "update-alternatives --set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk";
-    salt 'cmp*' cmd.run "service openvswitch-switch start"
-    salt 'cmp*' cmd.run "ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true"
+    salt 'cmp*' cmd.run "service openvswitch-switch stop";
+    salt 'cmp*' cmd.run "rm -f /var/lib/openvswitch/*";
+    salt 'cmp*' cmd.run "update-alternatives --remove ovs-vswitchd /usr/lib/openvswitch-switch/ovs-vswitchd";
+    salt 'cmp*' cmd.run "service openvswitch-switch start";
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 10}
   skip_fail: false
 
 {{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}
 
+- description: "Workaround to avoid reboot cmp nodes: bring OVS interfaces UP"
+  cmd: |
+    salt 'cmp*' cmd.run "ifup br-prv";
+    salt 'cmp*' cmd.run "ip l set up br-floating";
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 10}
+  skip_fail: false
+
 - description: Hack gtw node
   cmd: salt '{{ HOSTNAME_GTW01 }}' cmd.run "ip addr del {{ SHARED.IPV4_NET_CONTROL_PREFIX }}.110/24 dev ens4; ip addr flush dev ens4";
   node_name: {{ HOSTNAME_CFG01 }}