Fixed interfaces name due to LAB04 restructure. Change IP address of cmp001 for compatibility
Change-Id: Ic77452ab62658cc9b8ed3ebcb950a6312dbb97e2
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml
index 21b0703..31e6778 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml
@@ -51,7 +51,7 @@
interfaces:
enp2s0f1:
role: single_mgm
- deploy_address: 172.16.49.72
+ deploy_address: 172.16.49.73
enp5s0f0:
role: bond2_contrail_dpdk_prv
dpdk_pci: "'0000:05:00.0'"
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail-dpdk.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail-dpdk.yaml
index 80f389e..265d897 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail-dpdk.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail-dpdk.yaml
@@ -73,7 +73,7 @@
openstack_compute_node02_address: 10.167.8.102
openstack_compute_node01_single_address: 10.167.8.101
openstack_compute_node02_single_address: 10.167.8.102
- openstack_compute_node01_deploy_address: 172.16.49.72
+ openstack_compute_node01_deploy_address: 172.16.49.73
openstack_compute_node02_deploy_address: 172.16.49.74
openstack_control_address: 10.167.8.10
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
index 304bdab..c91448f 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
@@ -74,7 +74,7 @@
openstack_compute_node02_address: 10.167.8.102
openstack_compute_node01_single_address: 10.167.8.101
openstack_compute_node02_single_address: 10.167.8.102
- openstack_compute_node01_deploy_address: 172.16.49.72
+ openstack_compute_node01_deploy_address: 172.16.49.73
openstack_compute_node02_deploy_address: 172.16.49.74
openstack_control_address: 10.167.8.10
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt.yaml
index efa6773..f3e121d 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt.yaml
@@ -63,17 +63,6 @@
{{ SHARED.MACRO_CONFIGURE_RECLASS(FORMULA_SERVICES='"linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "keystone" "mysql" "grafana" "haproxy" "rsyslog" "horizon" "prometheus" "telegraf" "elasticsearch" "powerdns" "glusterfs" "xtrabackup" "maas" "backupninja" "jenkins"') }}
-- description: "Workaround for haproxy without listen"
- cmd: |
- set -e;
- git clone https://gerrit.mcp.mirantis.net/salt-formulas/haproxy;
- cd haproxy/;
- git fetch https://gerrit.mcp.mirantis.net/salt-formulas/haproxy refs/changes/39/11339/1 && git checkout FETCH_HEAD;
- cp haproxy/files/haproxy.cfg /srv/salt/env/prd/haproxy/files/;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 10}
- skip_fail: true
-
{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
- description: (REMOVE asap) Hack CFG of Hash sum mismatch
@@ -114,7 +103,7 @@
cmd: |
set -e;
# Add tenant and single addresses for computes
- salt-call reclass.cluster_meta_set deploy_address 172.16.49.72 /srv/salt/reclass/nodes/_generated/cmp001.cookied-bm-mcp-ocata-contrail.local.yml
+ salt-call reclass.cluster_meta_set deploy_address 172.16.49.73 /srv/salt/reclass/nodes/_generated/cmp001.cookied-bm-mcp-ocata-contrail.local.yml
salt-call reclass.cluster_meta_set tenant_address 192.168.0.101 /srv/salt/reclass/nodes/_generated/cmp001.cookied-bm-mcp-ocata-contrail.local.yml
salt-call reclass.cluster_meta_set single_address 10.167.8.101 /srv/salt/reclass/nodes/_generated/cmp001.cookied-bm-mcp-ocata-contrail.local.yml
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 }}