Rework interface roles to match cookiecutter template options
Change-Id: I26ddff3af840b805319ba2805e1cc80af22a5735
Reviewed-on: https://review.gerrithub.io/377228
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>
diff --git a/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml b/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
index 44b82ae..8f85554 100644
--- a/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
+++ b/tcp_tests/environment/environment_inventory/lab03_physical_inventory.yaml
@@ -8,9 +8,9 @@
- linux_system_codename_xenial
interfaces:
enp3s0f0:
- role: management_single
+ role: single_mgm
enp3s0f1:
- role: control_vlan_bond0
+ role: bond0_ab_ctl
kvm02.mcp11-ovs-dpdk.local:
reclass_storage_name: infra_kvm_node02
@@ -19,9 +19,9 @@
- linux_system_codename_xenial
interfaces:
eno1:
- role: management_single
+ role: single_mgm
eno2:
- role: control_vlan_bond0
+ role: bond0_ab_ctl
kvm03.mcp11-ovs-dpdk.local:
reclass_storage_name: infra_kvm_node03
@@ -30,9 +30,9 @@
- linux_system_codename_xenial
interfaces:
eno1:
- role: management_single
+ role: single_mgm
eno2:
- role: control_vlan_bond0
+ role: bond0_ab_ctl
cmp001.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_compute_node01
@@ -41,16 +41,16 @@
- linux_system_codename_xenial
interfaces:
enp3s0f0:
- role: management_single
+ role: single_mgm
enp3s0f1:
- role: control_vlan_bond0
+ role: bond0_ab_ctl
enp5s0f0:
- role: control_vlan_bond0
+ role: bond0_ab_ctl
enp5s0f1:
- role: private_dpdk_ovs
+ role: bond2_dpdk_prv
dpdk_pci: '0000:05:00.1'
enp5s0f2:
- role: private_dpdk_ovs
+ role: bond2_dpdk_prv
dpdk_pci: '0000:05:00.2'
cmp002.mcp11-ovs-dpdk.local:
@@ -60,16 +60,16 @@
- linux_system_codename_xenial
interfaces:
eno1:
- role: management_single
+ role: single_mgm
eth0:
- role: control_vlan_bond0
+ role: bond0_ab_ctl
eth3:
- role: control_vlan_bond0
+ role: bond0_ab_ctl
eth2:
- role: private_dpdk_ovs
+ role: bond2_dpdk_prv
dpdk_pci: '0000:05:00.1'
eth4:
- role: private_dpdk_ovs
+ role: bond2_dpdk_prv
dpdk_pci: '0000:0b:00.0'
gtw01.mcp11-ovs-dpdk.local:
@@ -79,9 +79,9 @@
- linux_system_codename_xenial
interfaces:
enp2s0f0:
- role: management_single
+ role: single_mgm
enp2s0f1:
- role: control_floating_bond0_ovs
+ role: bond0_ab_dvr_vlan_ctl_prv_floating
gtw02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_gateway_node02
@@ -90,6 +90,6 @@
- linux_system_codename_xenial
interfaces:
enp2s0f0:
- role: management_single
+ role: single_mgm
enp2s0f1:
- role: control_floating_bond0_ovs
+ role: bond0_ab_dvr_vlan_ctl_prv_floating
diff --git a/tcp_tests/environment/environment_inventory/vcp_os_sl_inventory.yaml b/tcp_tests/environment/environment_inventory/vcp_os_sl_inventory.yaml
index 78c6ba6..d5e043b 100644
--- a/tcp_tests/environment/environment_inventory/vcp_os_sl_inventory.yaml
+++ b/tcp_tests/environment/environment_inventory/vcp_os_sl_inventory.yaml
@@ -8,7 +8,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
ctl02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node02
@@ -17,7 +17,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
ctl03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node03
@@ -26,7 +26,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
dbs01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node01
@@ -35,7 +35,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
dbs02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node01
@@ -44,7 +44,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
dbs03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node01
@@ -53,7 +53,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
msg01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_message_queue_node01
@@ -62,7 +62,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
msg02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_message_queue_node02
@@ -71,7 +71,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
msg03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_message_queue_node03
@@ -80,7 +80,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mdb01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_telemetry_node01
@@ -89,7 +89,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mdb02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_telemetry_node02
@@ -98,7 +98,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mdb03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_telemetry_node03
@@ -107,7 +107,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
prx01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_proxy_node01
@@ -116,7 +116,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
prx02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_proxy_node02
@@ -125,7 +125,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mon01.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_monitor_node01
@@ -134,7 +134,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mon02.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_monitor_node02
@@ -143,7 +143,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mon03.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_monitor_node03
@@ -152,7 +152,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mtr01.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_telemetry_node01
@@ -161,7 +161,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mtr02.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_telemetry_node02
@@ -170,7 +170,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mtr03.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_telemetry_node03
@@ -179,7 +179,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
log01.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_log_node01
@@ -188,7 +188,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
log02.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_log_node02
@@ -197,7 +197,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
log03.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_log_node03
@@ -206,4 +206,4 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
diff --git a/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml b/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
index d68787c..d5c7a1b 100644
--- a/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
+++ b/tcp_tests/environment/environment_inventory/virtual-devops-mcp-ocata-sl2.yaml
@@ -6,7 +6,7 @@
- linux_system_codename_xenial
interfaces:
ens4:
- role: control_vcp_single
+ role: single_ctl
kvm02.mcp11-ovs-dpdk.local:
reclass_storage_name: infra_kvm_node02
@@ -15,7 +15,7 @@
- linux_system_codename_xenial
interfaces:
ens4:
- role: control_vcp_single
+ role: single_ctl
kvm03.mcp11-ovs-dpdk.local:
reclass_storage_name: infra_kvm_node03
@@ -24,7 +24,7 @@
- linux_system_codename_xenial
interfaces:
ens4:
- role: control_vcp_single
+ role: single_ctl
cid01.mcp11-ovs-dpdk.local:
reclass_storage_name: cicd_control_node01
@@ -33,7 +33,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
cid02.mcp11-ovs-dpdk.local:
reclass_storage_name: cicd_control_node02
@@ -42,7 +42,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
cid03.mcp11-ovs-dpdk.local:
reclass_storage_name: cicd_control_node03
@@ -51,7 +51,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
ctl01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node01
@@ -62,7 +62,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
ctl02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node02
@@ -72,7 +72,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
ctl03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node03
@@ -82,7 +82,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
dbs01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node01
@@ -92,7 +92,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
dbs02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node02
@@ -102,7 +102,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
dbs03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node03
@@ -112,7 +112,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
msg01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_message_queue_node01
@@ -121,7 +121,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
msg02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_message_queue_node02
@@ -130,7 +130,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
msg03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_message_queue_node03
@@ -139,7 +139,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mdb01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_telemetry_node01
@@ -148,7 +148,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mdb02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_telemetry_node02
@@ -157,7 +157,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mdb03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_telemetry_node03
@@ -166,7 +166,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
prx01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_proxy_node01
@@ -175,7 +175,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
prx02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_proxy_node02
@@ -184,7 +184,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mtr01.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_telemetry_node01
@@ -193,7 +193,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mtr02.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_telemetry_node02
@@ -202,7 +202,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
mtr03.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_telemetry_node03
@@ -211,7 +211,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
log01.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_log_node01
@@ -220,7 +220,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
log02.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_log_node02
@@ -229,7 +229,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
log03.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_log_node03
@@ -238,7 +238,7 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: control_vcp_single
+ role: single_ctl
# Generator-based computes. For compatibility only
cmp000.mcp11-ovs-dpdk.local:
@@ -248,10 +248,13 @@
- linux_system_codename_xenial
interfaces:
#ens3:
- # role: management_single
+ # role: single_mgm
ens4:
- role: control_bond0
- #TBD: ens5: tenant
+ role: single_ctl
+ ens5:
+ role: bond0_ab_ovs_vxlan_ctl_mesh
+ ens6:
+ role: bond1_ab_ovs_floating
gtw01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_gateway_node01
@@ -260,11 +263,13 @@
- linux_system_codename_xenial
interfaces:
#ens3:
- # role: management_single
+ # role: single_mgm
ens4:
- role: control_bond0
- #TBD: ens5: tenant
- #TBD: ens6: external
+ role: single_ctl
+ ens5:
+ role: bond0_ab_ovs_vxlan_ctl_mesh
+ ens6:
+ role: bond1_ab_ovs_floating
gtw02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_gateway_node02
@@ -273,9 +278,10 @@
- linux_system_codename_xenial
interfaces:
#ens3:
- # role: management_single
+ # role: single_mgm
ens4:
- role: control_bond0
- #TBD: ens5: tenant
- #TBD: ens6: external
-
+ role: single_ctl
+ ens5:
+ role: bond0_ab_ovs_vxlan_ctl_mesh
+ ens6:
+ role: bond1_ab_ovs_floating