Update dvr-vxlan
Change-Id: I03efe2ff335c7c7673af543117090786399489a8
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 7435fc8..37d0b14 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
@@ -14,7 +14,6 @@
reclass_storage_name: openstack_control_node02
roles:
- openstack_control
- - features_designate
- linux_system_codename_xenial
interfaces:
ens2:
@@ -37,9 +36,10 @@
reclass_storage_name: openstack_database_node01
roles:
- openstack_database_leader
- - features_designate_database
- linux_system_codename_xenial
interfaces:
+ ens2:
+ role: single_dhcp
ens3:
role: single_ctl
@@ -49,6 +49,8 @@
- openstack_database
- linux_system_codename_xenial
interfaces:
+ ens2:
+ role: single_dhcp
ens3:
role: single_ctl
@@ -56,9 +58,10 @@
reclass_storage_name: openstack_database_node03
roles:
- openstack_database
- - features_designate_database
- linux_system_codename_xenial
interfaces:
+ ens2:
+ role: single_dhcp
ens3:
role: single_ctl
@@ -68,6 +71,8 @@
- openstack_message_queue
- linux_system_codename_xenial
interfaces:
+ ens2:
+ role: single_dhcp
ens3:
role: single_ctl
@@ -77,6 +82,8 @@
- openstack_message_queue
- linux_system_codename_xenial
interfaces:
+ ens2:
+ role: single_dhcp
ens3:
role: single_ctl
@@ -86,6 +93,8 @@
- openstack_message_queue
- linux_system_codename_xenial
interfaces:
+ ens2:
+ role: single_dhcp
ens3:
role: single_ctl
@@ -93,9 +102,10 @@
reclass_storage_name: openstack_proxy_node01
roles:
- openstack_proxy
- - features_designate_proxy
- linux_system_codename_xenial
interfaces:
+ ens2:
+ role: single_dhcp
ens3:
role: single_ctl
@@ -103,35 +113,63 @@
reclass_storage_name: openstack_proxy_node02
roles:
- openstack_proxy
- - features_designate_proxy
+ - linux_system_codename_xenial
+ interfaces:
+ ens2:
+ 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
- mtr01.cookied-bm-mcp-dvr-vxlan.local:
- reclass_storage_name: stacklight_telemetry_node01
+ cid02.cookied-bm-mcp-dvr-vxlan.local:
+ reclass_storage_name: cicd_control_node02
roles:
- - stacklight_telemetry
+ - cicd_control_manager
- linux_system_codename_xenial
interfaces:
ens3:
role: single_ctl
- mtr02.cookied-bm-mcp-dvr-vxlan.local:
- reclass_storage_name: stacklight_telemetry_node02
+ cid03.cookied-bm-mcp-dvr-vxlan.local:
+ reclass_storage_name: cicd_control_node03
roles:
- - stacklight_telemetry
+ - cicd_control_manager
- linux_system_codename_xenial
interfaces:
ens3:
role: single_ctl
- mtr03.cookied-bm-mcp-dvr-vxlan.local:
- reclass_storage_name: stacklight_telemetry_node03
- roles:
- - stacklight_telemetry
- - 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