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/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