ifenslave on the other nodes
Change-Id: I64e8917ef136f3edd7e894ddfe3dd2bba81b61ba
Reviewed-on: https://review.gerrithub.io/362421
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>
diff --git a/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/salt.yaml b/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/salt.yaml
index 232b932..ff3b95f 100644
--- a/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/salt.yaml
+++ b/tcp_tests/templates/mk24_lab_ovs_dvr_vlan_bm/salt.yaml
@@ -257,7 +257,7 @@
- description: '*Workaround* of the bug https://mirantis.jira.com/browse/PROD-9576 to get bond0-connectivity *without* rebooting nodes'
cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' cmd.run
- 'cat /etc/network/interfaces' | grep bond-slaves | awk '{print $2}' | xargs -I {} ifenslave bond0 {}
+ "cat /etc/network/interfaces | grep bond-slaves | awk '{print \$2}' | xargs -I {} ifenslave bond0 {}"
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
diff --git a/tcp_tests/templates/physical_mcp11_dvr/salt.yaml b/tcp_tests/templates/physical_mcp11_dvr/salt.yaml
index 159605e..395d89c 100644
--- a/tcp_tests/templates/physical_mcp11_dvr/salt.yaml
+++ b/tcp_tests/templates/physical_mcp11_dvr/salt.yaml
@@ -236,14 +236,28 @@
-- description: Refresh pillars for kvm* nodes
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'kvm*' saltutil.refresh_pillar
+- description: Refresh pillars for present baremetal nodes
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' saltutil.refresh_pillar
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
-- description: Sync all salt resources for kvm* nodes
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False 'kvm*' saltutil.sync_all
+- description: Sync all salt resources for present baremetal nodes
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' saltutil.sync_all
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
+- description: Configure linux for present baremetal nodes
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False -C '* and not
+ cfg01*' state.sls linux
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 3, delay: 5}
+ skip_fail: false
+
+- description: '*Workaround* of the bug https://mirantis.jira.com/browse/PROD-9576 to get bond0-connectivity *without* rebooting nodes'
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*' cmd.run
+ "cat /etc/network/interfaces | grep bond-slaves | awk '{print \$2}' | xargs -I {} ifenslave bond0 {}"
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
diff --git a/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml b/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml
index 1f69a3a..cd08c85 100644
--- a/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml
+++ b/tcp_tests/templates/physical_mcp11_dvr/underlay.yaml
@@ -95,18 +95,18 @@
interfaces:
- label: eth0
- l2_network_device: admin
mac_address: !os_env ETH0_MAC_ADDRESS_CFG01
- label: eth1
+ l2_network_device: admin
mac_address: !os_env ETH1_MAC_ADDRESS_CFG01
network_config:
eth0:
networks:
- - admin
+ - infra
eth1:
networks:
- - control
+ - admin
- name: {{ HOSTNAME_KVM01 }}
role: salt_minion