Add workarounds to cookied-mcp-pike-dpdk
- update alternatives to use dpdk-enabled ovs : PROD-18833
- pre-install linux-headers : PROD-18834
Change-Id: I73fc7ae4d194331b97cc585ebbb2810cd00e3fce
diff --git a/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-environment.yaml
index 913636b..5a68626 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-environment.yaml
@@ -134,12 +134,12 @@
role: single_dhcp
ens4:
role: single_ctl
- ens5:
+ dpdkport0:
role: bond2_dpdk_prv
- dpdk_pci: "00:05.0"
- ens6:
+ dpdk_pci: "0000:00:05.0"
+ dpdkport1:
role: bond2_dpdk_prv
- dpdk_pci: "00:06.0"
+ dpdk_pci: "0000:00:06.0"
ens7:
role: bond1_ab_ovs_floating
diff --git a/tcp_tests/templates/cookied-mcp-pike-dpdk/salt.yaml b/tcp_tests/templates/cookied-mcp-pike-dpdk/salt.yaml
index d424970..a056d6d 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dpdk/salt.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dpdk/salt.yaml
@@ -30,6 +30,22 @@
retry: {count: 1, delay: 10}
skip_fail: false
+- description: "Workaround for PROD-18834: Pre-install linux-headers package"
+ cmd: salt 'cmp*' cmd.run "apt-get install -y linux-headers-$(uname -r)";
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
+- description: "Workaround for PROD-18833: Pre-install ovs packages and update alternatives to DPDK"
+ cmd: |
+ set -ex;
+ salt 'cmp*' cmd.run "apt-get install -y openvswitch-switch openvswitch-switch-dpdk";
+ salt 'cmp*' cmd.run "update-alternatives --set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk";
+ salt 'cmp*' cmd.run "service openvswitch-switch restart"
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
{{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}
- description: Hack gtw node