Fix genrated models for labs designed for static models
Also fixed 'designate' for ovs configs which are deployed
with bind9 backend
Change-Id: I744c79a950d2d82eb3dd90025ac74b69c3eefe4e
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-environment.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-environment.yaml
index 18a87be..63cedf1 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-environment.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-environment.yaml
@@ -8,7 +8,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
ctl01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node01
@@ -17,15 +17,16 @@
- openstack_control_leader
- openstack_database_leader
- openstack_message_queue
- - features_designate_database
- - features_designate
- - features_designate_keystone
+ - features_designate_bind9_database
+ - features_designate_bind9_dns
+ - features_designate_bind9
+ - features_designate_bind9_keystone
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
ctl02.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node02
@@ -34,14 +35,15 @@
- openstack_control
- openstack_database
- openstack_message_queue
- - features_designate_database
- - features_designate
+ - features_designate_bind9_database
+ - features_designate_bind9_dns
+ - features_designate_bind9
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
ctl03.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_control_node03
@@ -50,14 +52,14 @@
- openstack_control
- openstack_database
- openstack_message_queue
- - features_designate_database
- - features_designate
+ - features_designate_bind9_database
+ - features_designate_bind9
- linux_system_codename_xenial
interfaces:
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
prx01.mcp11-ovs-dpdk.local:
reclass_storage_name: openstack_proxy_node01
@@ -68,7 +70,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
mon01.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_server_node01
@@ -81,7 +83,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
mon02.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_server_node02
@@ -94,7 +96,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
mon03.mcp11-ovs-dpdk.local:
reclass_storage_name: stacklight_server_node03
@@ -107,7 +109,7 @@
ens3:
role: single_dhcp
ens4:
- role: single_vlan_ctl
+ role: single_ctl
# Generator-based computes. For compatibility only
cmp<<count>>.mcp11-ovs-dpdk.local:
@@ -119,9 +121,9 @@
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
@@ -134,8 +136,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