commit b3f5fe46184d13d50d837b792790731f4f45642d
author sgudz <sgudz@mirantis.com> Tue Feb 06 17:06:53 2018 +0200
committer sgudz <sgudz@mirantis.com> Tue Feb 06 17:07:05 2018 +0200
tree d9c137bd5bbaa5a15d5892c24a9bc7c4814f99b2
parent 4c86ed5146d827b3b5a0f8df32d632bea6271e3e

Fixed interfaces name due to LAB04 restructure. Change IP address of cmp001 for compatibility

Change-Id: Ic77452ab62658cc9b8ed3ebcb950a6312dbb97e2

tcp_tests/templates/cookied-bm-mcp-ocata-contrail/underlay.yaml

diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/underlay.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/underlay.yaml
index 4ec8772..2d0a783 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/underlay.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/underlay.yaml
@@ -17,7 +17,7 @@
 {% set ETH0_IP_ADDRESS_KVM01 = os_env('ETH0_IP_ADDRESS_KVM01', '172.16.49.67') %}
 {% set ETH0_IP_ADDRESS_KVM02 = os_env('ETH0_IP_ADDRESS_KVM02', '172.16.49.68') %}
 {% set ETH0_IP_ADDRESS_KVM03 = os_env('ETH0_IP_ADDRESS_KVM03', '172.16.49.69') %}
-{% set ETH0_IP_ADDRESS_CMP001 = os_env('ETH0_IP_ADDRESS_CMP001', '172.16.49.72') %}
+{% set ETH0_IP_ADDRESS_CMP001 = os_env('ETH0_IP_ADDRESS_CMP001', '172.16.49.73') %}
 {% set ETH0_IP_ADDRESS_CMP002 = os_env('ETH0_IP_ADDRESS_CMP002', '172.16.49.74') %}
 # {% set ETH0_IP_ADDRESS_CMP003 = os_env('ETH0_IP_ADDRESS_CMP003', '172.16.167.140') %}
 # {% set ETH0_IP_ADDRESS_GTW01 = os_env('ETH0_IP_ADDRESS_GTW01', '172.16.49.5') %}
@@ -235,7 +235,7 @@
 
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
-              cloud_init_iface_up: enp2s0f0  # see 'interfaces' below.
+              cloud_init_iface_up: enp9s0f0  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200
@@ -253,14 +253,14 @@
                   cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
-                - label: enp2s0f0
+                - label: enp9s0f0
                   l2_network_device: admin
                   mac_address: !os_env ETH0_MAC_ADDRESS_KVM01
-                - label: enp2s0f1
+                - label: enp9s0f1
                   mac_address: !os_env ETH1_MAC_ADDRESS_KVM01
 
               network_config:
-                enp2s0f0:
+                enp9s0f0:
                   networks:
                    - admin
                 bond0:
@@ -268,7 +268,7 @@
                    - control
                   aggregation: active-backup
                   parents:
-                   - enp2s0f1
+                   - enp9s0f1
 
           - name: {{ HOSTNAME_KVM02 }}
             role: salt_minion
@@ -282,7 +282,7 @@
 
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
-              cloud_init_iface_up: enp2s0f0  # see 'interfaces' below.
+              cloud_init_iface_up: enp9s0f0  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200
@@ -300,14 +300,14 @@
                   cloudinit_user_data: *cloudinit_user_data
 
               interfaces:
-                - label: enp2s0f0
+                - label: enp9s0f0
                   l2_network_device: admin
                   mac_address: !os_env ETH0_MAC_ADDRESS_KVM02
-                - label: enp2s0f1
+                - label: enp9s0f1
                   mac_address: !os_env ETH1_MAC_ADDRESS_KVM02
 
               network_config:
-                enp2s0f0:
+                enp9s0f0:
                   networks:
                    - admin
                 bond0:
@@ -315,7 +315,7 @@
                    - control
                   aggregation: active-backup
                   parents:
-                   - enp2s0f1
+                   - enp9s0f1
 
           - name: {{ HOSTNAME_KVM03 }}
             role: salt_minion
@@ -330,7 +330,7 @@
               root_volume_name: system     # see 'volumes' below
               cloud_init_volume_name: iso  # see 'volumes' below
               # cloud_init_iface_up: eno1  # see 'interfaces' below.
-              cloud_init_iface_up: enp2s0f0  # see 'interfaces' below.
+              cloud_init_iface_up: enp9s0f0  # see 'interfaces' below.
               volumes:
                 - name: system
                   capacity: !os_env NODE_VOLUME_SIZE, 200
@@ -349,16 +349,16 @@
 
               interfaces:
                 # - label: eno1
-                - label: enp2s0f0
+                - label: enp9s0f0
                   l2_network_device: admin
                   mac_address: !os_env ETH0_MAC_ADDRESS_KVM03
                 # - label: eno2
-                - label: enp2s0f1
+                - label: enp9s0f1
                   mac_address: !os_env ETH1_MAC_ADDRESS_KVM03
 
               network_config:
                 # eno1:
-                enp2s0f0:
+                enp9s0f0:
                   networks:
                    - admin
                 bond0:
@@ -366,7 +366,7 @@
                    - control
                   aggregation: active-backup
                   parents:
-                   - enp2s0f1
+                   - enp9s0f1
 
 
           - name: {{ HOSTNAME_CMP001 }}