Update queens models and context
Change-Id: I1f60df6258e965d79a3e76262ffa055114d97e7f
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml
index 0f806cf..5652b84 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml
@@ -1,5 +1,5 @@
nodes:
- cfg01.mcp11-ovs-dpdk.local:
+ cfg01.mcp-queens-dvr.local:
reclass_storage_name: infra_config_node01
roles:
- infra_config
@@ -10,16 +10,13 @@
ens4:
role: single_ctl
- ctl01.mcp11-ovs-dpdk.local:
+ ctl01.mcp-queens-dvr.local:
reclass_storage_name: openstack_control_node01
roles:
- infra_kvm
- openstack_control_leader
- openstack_database_leader
- openstack_message_queue
-# - features_designate_pool_manager_database
-# - features_designate_pool_manager
-# - features_designate_pool_manager_keystone
- linux_system_codename_xenial
interfaces:
ens3:
@@ -27,15 +24,13 @@
ens4:
role: single_ctl
- ctl02.mcp11-ovs-dpdk.local:
+ ctl02.mcp-queens-dvr.local:
reclass_storage_name: openstack_control_node02
roles:
- infra_kvm
- openstack_control
- openstack_database
- openstack_message_queue
-# - features_designate_pool_manager_database
-# - features_designate_pool_manager
- linux_system_codename_xenial
interfaces:
ens3:
@@ -43,15 +38,13 @@
ens4:
role: single_ctl
- ctl03.mcp11-ovs-dpdk.local:
+ ctl03.mcp-queens-dvr.local:
reclass_storage_name: openstack_control_node03
roles:
- infra_kvm
- openstack_control
- openstack_database
- openstack_message_queue
-# - features_designate_pool_manager_database
-# - features_designate_pool_manager
- linux_system_codename_xenial
interfaces:
ens3:
@@ -59,11 +52,10 @@
ens4:
role: single_ctl
- prx01.mcp11-ovs-dpdk.local:
+ prx01.mcp-queens-dvr.local:
reclass_storage_name: openstack_proxy_node01
roles:
- openstack_proxy
-# - features_designate_pool_manager_proxy
- linux_system_codename_xenial
interfaces:
ens3:
@@ -71,7 +63,7 @@
ens4:
role: single_ctl
- mon01.mcp11-ovs-dpdk.local:
+ mon01.mcp-queens-dvr.local:
reclass_storage_name: stacklight_server_node01
roles:
- stacklightv2_server_leader
@@ -82,7 +74,7 @@
ens4:
role: single_ctl
- mon02.mcp11-ovs-dpdk.local:
+ mon02.mcp-queens-dvr.local:
reclass_storage_name: stacklight_server_node02
roles:
- stacklightv2_server
@@ -93,7 +85,7 @@
ens4:
role: single_ctl
- mon03.mcp11-ovs-dpdk.local:
+ mon03.mcp-queens-dvr.local:
reclass_storage_name: stacklight_server_node03
roles:
- stacklightv2_server
@@ -104,7 +96,7 @@
ens4:
role: single_ctl
- log01.mcp11-ovs-dpdk.local:
+ log01.mcp-queens-dvr.local:
reclass_storage_name: stacklight_log_node01
roles:
- stacklight_log_leader_v2
@@ -115,7 +107,7 @@
ens4:
role: single_ctl
- log02.mcp11-ovs-dpdk.local:
+ log02.mcp-queens-dvr.local:
reclass_storage_name: stacklight_log_node02
roles:
- stacklight_log
@@ -126,7 +118,7 @@
ens4:
role: single_ctl
- log03.mcp11-ovs-dpdk.local:
+ log03.mcp-queens-dvr.local:
reclass_storage_name: stacklight_log_node03
roles:
- stacklight_log
@@ -137,7 +129,7 @@
ens4:
role: single_ctl
- mtr01.mcp11-ovs-dpdk.local:
+ mtr01.mcp-queens-dvr.local:
reclass_storage_name: stacklight_telemetry_node01
roles:
- stacklight_telemetry_leader
@@ -148,7 +140,7 @@
ens4:
role: single_ctl
- mtr02.mcp11-ovs-dpdk.local:
+ mtr02.mcp-queens-dvr.local:
reclass_storage_name: stacklight_telemetry_node02
roles:
- stacklight_telemetry
@@ -159,7 +151,7 @@
ens4:
role: single_ctl
- mtr03.mcp11-ovs-dpdk.local:
+ mtr03.mcp-queens-dvr.local:
reclass_storage_name: stacklight_telemetry_node03
roles:
- stacklight_telemetry
@@ -171,7 +163,7 @@
role: single_ctl
# Generator-based computes. For compatibility only
- cmp<<count>>.mcp11-ovs-dpdk.local:
+ cmp<<count>>.mcp-queens-dvr.local:
reclass_storage_name: openstack_compute_rack01
roles:
- openstack_compute
@@ -186,7 +178,7 @@
ens6:
role: bond1_ab_ovs_floating
- gtw01.mcp11-ovs-dpdk.local:
+ gtw01.mcp-queens-dvr.local:
reclass_storage_name: openstack_gateway_node01
roles:
- openstack_gateway
@@ -201,36 +193,22 @@
ens6:
role: bond1_ab_ovs_floating
-# dns01.mcp11-ovs-dpdk.local:
+# dns01.mcp-queens-dvr.local:
# reclass_storage_name: openstack_dns_node01
# roles:
-# - features_designate_pool_manager_dns
# - linux_system_codename_xenial
-# classes:
-# - system.linux.system.repo.mcp.extra
-# - system.linux.system.repo.mcp.apt_mirantis.openstack
-# - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-# - system.linux.system.repo.mcp.apt_mirantis.saltstack
# interfaces:
# ens3:
# role: single_dhcp
# ens4:
# role: single_ctl
-# single_address: ${_param:openstack_dns_node01_address}
#
-# dns02.mcp11-ovs-dpdk.local:
+# dns02.mcp-queens-dvr.local:
# reclass_storage_name: openstack_dns_node02
# roles:
-# - features_designate_pool_manager_dns
# - linux_system_codename_xenial
-# classes:
-# - system.linux.system.repo.mcp.extra
-# - system.linux.system.repo.mcp.apt_mirantis.openstack
-# - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-# - system.linux.system.repo.mcp.apt_mirantis.saltstack
# interfaces:
# ens3:
-# role: single_dhcp
+# role: single_dhcp
# ens4:
-# role: single_ctl
-# single_address: ${_param:openstack_dns_node02_address}
+# role: single_ctl
\ No newline at end of file