Regenerate cfg01* node with reclass.storage
Change-Id: I074a46a31d9d296bd1706c9550e6b53ee78a91b0
Reviewed-on: https://review.gerrithub.io/377390
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 d5c7a1b..a5b3c1e 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
@@ -1,12 +1,25 @@
nodes:
+ cfg01.mcp11-ovs-dpdk.local:
+ reclass_storage_name: infra_config_node01
+ roles:
+ - infra_config
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
+
kvm01.mcp11-ovs-dpdk.local:
reclass_storage_name: infra_kvm_node01
roles:
- infra_kvm
- linux_system_codename_xenial
interfaces:
+ ens3:
+ role: single_dhcp
ens4:
- role: single_ctl
+ role: single_vlan_ctl
kvm02.mcp11-ovs-dpdk.local:
reclass_storage_name: infra_kvm_node02
@@ -14,8 +27,10 @@
- infra_kvm
- linux_system_codename_xenial
interfaces:
+ ens3:
+ role: single_dhcp
ens4:
- role: single_ctl
+ role: single_vlan_ctl
kvm03.mcp11-ovs-dpdk.local:
reclass_storage_name: infra_kvm_node03
@@ -23,8 +38,10 @@
- infra_kvm
- linux_system_codename_xenial
interfaces:
+ ens3:
+ role: single_dhcp
ens4:
- role: single_ctl
+ role: single_vlan_ctl
cid01.mcp11-ovs-dpdk.local:
reclass_storage_name: cicd_control_node01
@@ -33,7 +50,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
cid02.mcp11-ovs-dpdk.local:
reclass_storage_name: cicd_control_node02
@@ -42,7 +61,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
cid03.mcp11-ovs-dpdk.local:
reclass_storage_name: cicd_control_node03
@@ -51,7 +72,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
ctl01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node01
@@ -62,7 +85,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
ctl02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node02
@@ -72,7 +97,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
ctl03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node03
@@ -82,7 +109,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
dbs01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node01
@@ -92,7 +121,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
dbs02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node02
@@ -102,7 +133,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
dbs03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_database_node03
@@ -112,7 +145,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
msg01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_message_queue_node01
@@ -121,7 +156,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
msg02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_message_queue_node02
@@ -130,7 +167,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
msg03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_message_queue_node03
@@ -139,7 +178,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
mdb01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_telemetry_node01
@@ -148,7 +189,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
mdb02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_telemetry_node02
@@ -157,7 +200,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
mdb03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_telemetry_node03
@@ -166,7 +211,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
prx01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_proxy_node01
@@ -175,7 +222,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
prx02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_proxy_node02
@@ -184,7 +233,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
mtr01.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_telemetry_node01
@@ -193,7 +244,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
mtr02.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_telemetry_node02
@@ -202,7 +255,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
mtr03.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_telemetry_node03
@@ -211,7 +266,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
log01.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_log_node01
@@ -220,7 +277,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
log02.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_log_node02
@@ -229,7 +288,9 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
log03.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_log_node03
@@ -238,19 +299,21 @@
- linux_system_codename_xenial
interfaces:
ens3:
- role: single_ctl
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
# Generator-based computes. For compatibility only
- cmp000.mcp11-ovs-dpdk.local:
+ cmp<<count>>.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_compute_rack01
roles:
- openstack_compute
- linux_system_codename_xenial
interfaces:
- #ens3:
- # role: single_mgm
+ ens3:
+ role: single_dhcp
ens4:
- role: single_ctl
+ role: bond0_ab_ovs_vxlan_ctl_mesh
ens5:
role: bond0_ab_ovs_vxlan_ctl_mesh
ens6:
@@ -262,10 +325,10 @@
- openstack_gateway
- linux_system_codename_xenial
interfaces:
- #ens3:
- # role: single_mgm
+ ens3:
+ role: single_dhcp
ens4:
- role: single_ctl
+ role: bond0_ab_ovs_vxlan_ctl_mesh
ens5:
role: bond0_ab_ovs_vxlan_ctl_mesh
ens6:
@@ -277,10 +340,10 @@
- openstack_gateway
- linux_system_codename_xenial
interfaces:
- #ens3:
- # role: single_mgm
+ ens3:
+ role: single_dhcp
ens4:
- role: single_ctl
+ role: bond0_ab_ovs_vxlan_ctl_mesh
ens5:
role: bond0_ab_ovs_vxlan_ctl_mesh
ens6: