commit 1e8d5f75ea32aece8c4d164cc445f03369fda78a
author Oleksii Butenko <obutenko@mirantis.com> Thu May 24 16:24:25 2018 +0300
committer Oleksii Butenko <obutenko@mirantis.com> Fri Jun 15 13:05:07 2018 +0000
tree 1bb807db65908ab588d4ce2e64fb59f118303e03
parent 2405d366ba00c1559014e2f00f68387d6b5646ab

add lacp bond

Change-Id: I2760636fb8dd2ebdb528f9668d52804afa83aebd

tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay.yaml

diff --git a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay.yaml b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay.yaml
index c4307eb..ae10126 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/underlay.yaml
@@ -318,7 +318,7 @@
 
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
-              cloud_init_iface_up: enp3s0f0  # see 'interfaces' below.
+              cloud_init_iface_up: enp5s0f0  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200
@@ -337,30 +337,18 @@
 
               interfaces:
                 - label: enp3s0f0
-                  l2_network_device: admin
                   mac_address: !os_env ETH0_MAC_ADDRESS_CMP01
                 - label: enp3s0f1
                   mac_address: !os_env ETH1_MAC_ADDRESS_CMP01
                 - label: enp5s0f0
+                  l2_network_device: admin
                   mac_address: !os_env ETH2_MAC_ADDRESS_CMP01
-                  features: ['dpdk', 'dpdk_pci: 0000:05:00.0']
                 - label: enp5s0f1
                   mac_address: !os_env ETH3_MAC_ADDRESS_CMP01
-                  features: ['dpdk', 'dpdk_pci: 0000:05:00.1']
-
               network_config:
-                enp3s0f0:
+                enp5s0f0:
                   networks:
                    - admin
-                bond0:
-                  networks:
-                   - control
-                  aggregation: active-backup
-                  parents:
-                   - enp3s0f0
-                   - enp3s0f1
-
-
 
           - name: {{ HOSTNAME_CMP02 }}
             role: salt_minion
@@ -374,7 +362,7 @@
 
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
-              cloud_init_iface_up: enp3s0f0  # see 'interfaces' below.
+              cloud_init_iface_up: enp5s0f0  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200
@@ -393,28 +381,18 @@
 
               interfaces:
                 - label: enp3s0f0
-                  l2_network_device: admin
                   mac_address: !os_env ETH0_MAC_ADDRESS_CMP02
                 - label: enp3s0f1
                   mac_address: !os_env ETH1_MAC_ADDRESS_CMP02
                 - label: enp5s0f0
+                  l2_network_device: admin
                   mac_address: !os_env ETH2_MAC_ADDRESS_CMP02
-                  features: ['dpdk', 'dpdk_pci: 0000:05:00.0']
                 - label: enp5s0f1
                   mac_address: !os_env ETH3_MAC_ADDRESS_CMP02
-                  features: ['dpdk', 'dpdk_pci: 0000:05:00.1']
               network_config:
-                enp3s0f0:
+                enp5s0f0:
                   networks:
                    - admin
-                bond0:
-                  networks:
-                   - control
-                  aggregation: active-backup
-                  parents:
-                   - enp3s0f0
-                   - enp3s0f1
-
 
           - name: {{ HOSTNAME_GTW01 }}
             role: salt_minion