Fix dvr-vxlan model
Change-Id: I982f6b3c8788c179fefc7e9a74d8482b77bd774b
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml
index 37d0b14..6cace03 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-vcp-environment.yaml
@@ -4,6 +4,7 @@
roles:
- openstack_control_leader
- linux_system_codename_xenial
+ - features_lvm_backend_control
interfaces:
ens2:
role: single_dhcp
@@ -15,6 +16,7 @@
roles:
- openstack_control
- linux_system_codename_xenial
+ - features_lvm_backend_control
interfaces:
ens2:
role: single_dhcp
@@ -26,6 +28,7 @@
roles:
- openstack_control
- linux_system_codename_xenial
+ - features_lvm_backend_control
interfaces:
ens2:
role: single_dhcp
@@ -119,57 +122,3 @@
role: single_dhcp
ens3:
role: single_ctl
-
- cid01.cookied-bm-mcp-dvr-vxlan.local:
- reclass_storage_name: cicd_control_node01
- roles:
- - cicd_control_leader
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_ctl
-
- cid02.cookied-bm-mcp-dvr-vxlan.local:
- reclass_storage_name: cicd_control_node02
- roles:
- - cicd_control_manager
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_ctl
-
- cid03.cookied-bm-mcp-dvr-vxlan.local:
- reclass_storage_name: cicd_control_node03
- roles:
- - cicd_control_manager
- - linux_system_codename_xenial
- interfaces:
- ens3:
- role: single_ctl
-
-# mon01.cookied-bm-mcp-dvr-vxlan.local:
-# reclass_storage_name: stacklight_server_node01
-# roles:
-# - stacklightv2_server_leader
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl
-#
-# mon02.cookied-bm-mcp-dvr-vxlan.local:
-# reclass_storage_name: stacklight_server_node02
-# roles:
-# - stacklightv2_server
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl
-#
-# mon03.cookied-bm-mcp-dvr-vxlan.local:
-# reclass_storage_name: stacklight_server_node03
-# roles:
-# - stacklightv2_server
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl