Fix for missing mon* nodes in environment inventory
Change-Id: I970fe9fa31decdae51d32bfbc77357ead02b8060
diff --git a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-environment.yaml b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-environment.yaml
index c520c5c..332473c 100644
--- a/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-ocata-dvr-vxlan/salt-context-environment.yaml
@@ -1,5 +1,5 @@
nodes:
- cfg01.mcp11-ovs-dpdk.local:
+ cfg01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: infra_config_node01
roles:
- infra_config
@@ -10,7 +10,7 @@
ens4:
role: single_vlan_ctl
- kvm01.mcp11-ovs-dpdk.local:
+ kvm01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: infra_kvm_node01
roles:
- infra_kvm
@@ -21,7 +21,7 @@
ens4:
role: single_vlan_ctl
- kvm02.mcp11-ovs-dpdk.local:
+ kvm02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: infra_kvm_node02
roles:
- infra_kvm
@@ -32,7 +32,7 @@
ens4:
role: single_vlan_ctl
- kvm03.mcp11-ovs-dpdk.local:
+ kvm03.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: infra_kvm_node03
roles:
- infra_kvm
@@ -43,7 +43,7 @@
ens4:
role: single_vlan_ctl
- cid01.mcp11-ovs-dpdk.local:
+ cid01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: cicd_control_node01
roles:
- cicd_control_leader
@@ -54,7 +54,7 @@
ens4:
role: single_vlan_ctl
- cid02.mcp11-ovs-dpdk.local:
+ cid02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: cicd_control_node02
roles:
- cicd_control_manager
@@ -65,7 +65,7 @@
ens4:
role: single_vlan_ctl
- cid03.mcp11-ovs-dpdk.local:
+ cid03.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: cicd_control_node03
roles:
- cicd_control_manager
@@ -76,7 +76,7 @@
ens4:
role: single_vlan_ctl
- ctl01.mcp11-ovs-dpdk.local:
+ ctl01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_control_node01
roles:
- openstack_control_leader
@@ -89,7 +89,7 @@
ens4:
role: single_vlan_ctl
- ctl02.mcp11-ovs-dpdk.local:
+ ctl02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_control_node02
roles:
- openstack_control
@@ -101,7 +101,7 @@
ens4:
role: single_vlan_ctl
- ctl03.mcp11-ovs-dpdk.local:
+ ctl03.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_control_node03
roles:
- openstack_control
@@ -113,7 +113,7 @@
ens4:
role: single_vlan_ctl
- dbs01.mcp11-ovs-dpdk.local:
+ dbs01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_database_node01
roles:
- openstack_database_leader
@@ -125,7 +125,7 @@
ens4:
role: single_vlan_ctl
- dbs02.mcp11-ovs-dpdk.local:
+ dbs02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_database_node02
roles:
- openstack_database
@@ -137,7 +137,7 @@
ens4:
role: single_vlan_ctl
- dbs03.mcp11-ovs-dpdk.local:
+ dbs03.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_database_node03
roles:
- openstack_database
@@ -149,7 +149,7 @@
ens4:
role: single_vlan_ctl
- msg01.mcp11-ovs-dpdk.local:
+ msg01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_message_queue_node01
roles:
- openstack_message_queue
@@ -160,7 +160,7 @@
ens4:
role: single_vlan_ctl
- msg02.mcp11-ovs-dpdk.local:
+ msg02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_message_queue_node02
roles:
- openstack_message_queue
@@ -171,7 +171,7 @@
ens4:
role: single_vlan_ctl
- msg03.mcp11-ovs-dpdk.local:
+ msg03.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_message_queue_node03
roles:
- openstack_message_queue
@@ -182,7 +182,7 @@
ens4:
role: single_vlan_ctl
- mdb01.mcp11-ovs-dpdk.local:
+ mdb01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_telemetry_node01
roles:
- openstack_telemetry
@@ -193,7 +193,7 @@
ens4:
role: single_vlan_ctl
- mdb02.mcp11-ovs-dpdk.local:
+ mdb02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_telemetry_node02
roles:
- openstack_telemetry
@@ -204,7 +204,7 @@
ens4:
role: single_vlan_ctl
- mdb03.mcp11-ovs-dpdk.local:
+ mdb03.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_telemetry_node03
roles:
- openstack_telemetry
@@ -215,7 +215,7 @@
ens4:
role: single_vlan_ctl
- prx01.mcp11-ovs-dpdk.local:
+ prx01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_proxy_node01
roles:
- openstack_proxy
@@ -226,7 +226,7 @@
ens4:
role: single_vlan_ctl
- prx02.mcp11-ovs-dpdk.local:
+ prx02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_proxy_node02
roles:
- openstack_proxy
@@ -237,7 +237,40 @@
ens4:
role: single_vlan_ctl
- mtr01.mcp11-ovs-dpdk.local:
+ mon01.mcp-ocata-dvr-vxlan.local:
+ reclass_storage_name: stacklight_server_node01
+ roles:
+ - stacklightv2_server_leader
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
+
+ mon02.mcp-ocata-dvr-vxlan.local:
+ reclass_storage_name: stacklight_server_node02
+ roles:
+ - stacklightv2_server
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
+
+ mon03.mcp-ocata-dvr-vxlan.local:
+ reclass_storage_name: stacklight_server_node03
+ roles:
+ - stacklightv2_server
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_vlan_ctl
+
+ mtr01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: stacklight_telemetry_node01
roles:
- stacklight_telemetry_leader
@@ -248,7 +281,7 @@
ens4:
role: single_vlan_ctl
- mtr02.mcp11-ovs-dpdk.local:
+ mtr02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: stacklight_telemetry_node02
roles:
- stacklight_telemetry
@@ -259,7 +292,7 @@
ens4:
role: single_vlan_ctl
- mtr03.mcp11-ovs-dpdk.local:
+ mtr03.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: stacklight_telemetry_node03
roles:
- stacklight_telemetry
@@ -270,7 +303,7 @@
ens4:
role: single_vlan_ctl
- log01.mcp11-ovs-dpdk.local:
+ log01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: stacklight_log_node01
roles:
- stacklight_log_leader_v2
@@ -281,7 +314,7 @@
ens4:
role: single_vlan_ctl
- log02.mcp11-ovs-dpdk.local:
+ log02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: stacklight_log_node02
roles:
- stacklight_log
@@ -292,7 +325,7 @@
ens4:
role: single_vlan_ctl
- log03.mcp11-ovs-dpdk.local:
+ log03.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: stacklight_log_node03
roles:
- stacklight_log
@@ -304,7 +337,7 @@
role: single_vlan_ctl
# Generator-based computes. For compatibility only
- cmp<<count>>.mcp11-ovs-dpdk.local:
+ cmp<<count>>.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_compute_rack01
roles:
- openstack_compute
@@ -319,7 +352,7 @@
ens6:
role: bond1_ab_ovs_floating
- gtw01.mcp11-ovs-dpdk.local:
+ gtw01.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_gateway_node01
roles:
- openstack_gateway
@@ -334,7 +367,7 @@
ens6:
role: bond1_ab_ovs_floating
- gtw02.mcp11-ovs-dpdk.local:
+ gtw02.mcp-ocata-dvr-vxlan.local:
reclass_storage_name: openstack_gateway_node02
roles:
- openstack_gateway