Remove extra bond0 interface from kvm/osd nodes
PROD-35758
Change-Id: I8a16503007961b76e403e97e0b849be79278e3ee
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt.yaml
index 561c8a1..21d8fb4 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt.yaml
@@ -76,6 +76,7 @@
retry: {count: 6, delay: 5}
skip_fail: false
-{{SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS()}}
+{{ SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS() }}
+{{ SHARED_WORKAROUNDS.DELETE_BOND0() }}
{{ SHARED_WORKAROUNDS.MACRO_CEPH_SET_PGNUM() }}
{{ SHARED_WORKAROUNDS.CLEAR_CEPH_OSD_DRIVES() }}
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt.yaml
index df263e9..43e40d4 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt.yaml
@@ -76,6 +76,7 @@
retry: {count: 6, delay: 5}
skip_fail: false
-{{SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS()}}
+{{ SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS() }}
+{{ SHARED_WORKAROUNDS.DELETE_BOND0() }}
{{ SHARED_WORKAROUNDS.MACRO_CEPH_SET_PGNUM() }}
{{ SHARED_WORKAROUNDS.CLEAR_CEPH_OSD_DRIVES() }}
\ No newline at end of file
diff --git a/tcp_tests/templates/shared-workarounds.yaml b/tcp_tests/templates/shared-workarounds.yaml
index 5e508fd..8f2d67b 100644
--- a/tcp_tests/templates/shared-workarounds.yaml
+++ b/tcp_tests/templates/shared-workarounds.yaml
@@ -29,4 +29,19 @@
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 1}
skip_fail: true
+{%- endmacro %}
+
+
+{%- macro DELETE_BOND0() %}
+{######################################}
+- description: |
+ Delete empty bond0 interface on kvm and osd nodes. RelatedProd:PROD-35758
+
+ cmd: |
+ set -x;
+ salt -C 'osd* or kvm*' cmd.run 'ip link delete bond0'
+ salt -C 'osd* or kvm*' file.write /etc/modprobe.d/bonding.conf "options bonding max_bonds=0"
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 1}
+ skip_fail: true
{%- endmacro %}
\ No newline at end of file