Update ssl models
Change-Id: Ic9d724fa9e692631893cba3a9b6638cb0bf8356e
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-environment.yaml
index 2e68b53..f2f7742 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-environment.yaml
@@ -1,5 +1,5 @@
nodes:
- cfg01.cookied-mcp-pike-dvr-ssl.local:
+ cfg01.mcp-pike-dvr-ssl.local:
reclass_storage_name: infra_config_node01
roles:
- infra_config
@@ -8,113 +8,165 @@
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
- ctl01.cookied-mcp-pike-dvr-ssl.local:
+ ctl01.mcp-pike-dvr-ssl.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
- features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
- ctl02.cookied-mcp-pike-dvr-ssl.local:
+ ctl02.mcp-pike-dvr-ssl.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
- features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
- ctl03.cookied-mcp-pike-dvr-ssl.local:
+ ctl03.mcp-pike-dvr-ssl.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
- features_lvm_backend_control
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
- prx01.cookied-mcp-pike-dvr-ssl.local:
+ prx01.mcp-pike-dvr-ssl.local:
reclass_storage_name: openstack_proxy_node01
roles:
- openstack_proxy
- - features_designate_pool_manager_proxy
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
- mon01.cookied-mcp-pike-dvr-ssl.local:
+ mon01.mcp-pike-dvr-ssl.local:
reclass_storage_name: stacklight_server_node01
roles:
- stacklightv2_server_leader
- - stacklight_telemetry_leader
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_ctl
+
+ mon02.mcp-pike-dvr-ssl.local:
+ reclass_storage_name: stacklight_server_node02
+ roles:
+ - stacklightv2_server
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_ctl
+
+ mon03.mcp-pike-dvr-ssl.local:
+ reclass_storage_name: stacklight_server_node03
+ roles:
+ - stacklightv2_server
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_ctl
+
+ log01.mcp-pike-dvr-ssl.local:
+ reclass_storage_name: stacklight_log_node01
+ roles:
- stacklight_log_leader_v2
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
- mon02.cookied-mcp-pike-dvr-ssl.local:
- reclass_storage_name: stacklight_server_node02
+ log02.mcp-pike-dvr-ssl.local:
+ reclass_storage_name: stacklight_log_node02
roles:
- - stacklightv2_server
- - stacklight_telemetry
- stacklight_log
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
- mon03.cookied-mcp-pike-dvr-ssl.local:
- reclass_storage_name: stacklight_server_node03
+ log03.mcp-pike-dvr-ssl.local:
+ reclass_storage_name: stacklight_log_node03
roles:
- - stacklightv2_server
- - stacklight_telemetry
- stacklight_log
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
+
+ mtr01.mcp-pike-dvr-ssl.local:
+ reclass_storage_name: stacklight_telemetry_node01
+ roles:
+ - stacklight_telemetry_leader
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_ctl
+
+ mtr02.mcp-pike-dvr-ssl.local:
+ reclass_storage_name: stacklight_telemetry_node02
+ roles:
+ - stacklight_telemetry
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_ctl
+
+ mtr03.mcp-pike-dvr-ssl.local:
+ reclass_storage_name: stacklight_telemetry_node03
+ roles:
+ - stacklight_telemetry
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
+ ens4:
+ role: single_ctl
# Generator-based computes. For compatibility only
- cmp<<count>>.cookied-mcp-pike-dvr-ssl.local:
+ cmp<<count>>.mcp-pike-dvr-ssl.local:
reclass_storage_name: openstack_compute_rack01
roles:
- openstack_compute
@@ -124,13 +176,13 @@
ens3:
role: single_dhcp
ens4:
- role: bond0_ab_ovs_vxlan_ctl_mesh
+ role: single_ctl
ens5:
- role: bond0_ab_ovs_vxlan_ctl_mesh
+ role: bond0_ab_ovs_vxlan_mesh
ens6:
role: bond1_ab_ovs_floating
- gtw01.cookied-mcp-pike-dvr-ssl.local:
+ gtw01.mcp-pike-dvr-ssl.local:
reclass_storage_name: openstack_gateway_node01
roles:
- openstack_gateway
@@ -139,42 +191,8 @@
ens3:
role: single_dhcp
ens4:
- role: bond0_ab_ovs_vxlan_ctl_mesh
+ role: single_ctl
ens5:
- role: bond0_ab_ovs_vxlan_ctl_mesh
+ role: bond0_ab_ovs_vxlan_mesh
ens6:
role: bond1_ab_ovs_floating
-
- dns01.cookied-mcp-pike-dvr-ssl.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_vlan_ctl
- single_address: ${_param:openstack_dns_node01_address}
-
- dns02.cookied-mcp-pike-dvr-ssl.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
- ens4:
- role: single_vlan_ctl
- single_address: ${_param:openstack_dns_node02_address}