Move cinder-volume to cmp
Fix tempest runner
Change-Id: I99fef021b50be5ded870fa580f4c9711a555eb80
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 8623fd2..ab61036 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
@@ -38,8 +38,6 @@
- openstack_database_leader
- linux_system_codename_xenial
interfaces:
- ens2:
- role: single_dhcp
ens3:
role: single_ctl
@@ -49,8 +47,6 @@
- openstack_database
- linux_system_codename_xenial
interfaces:
- ens2:
- role: single_dhcp
ens3:
role: single_ctl
@@ -60,8 +56,6 @@
- openstack_database
- linux_system_codename_xenial
interfaces:
- ens2:
- role: single_dhcp
ens3:
role: single_ctl
@@ -71,8 +65,6 @@
- openstack_message_queue
- linux_system_codename_xenial
interfaces:
- ens2:
- role: single_dhcp
ens3:
role: single_ctl
@@ -82,8 +74,6 @@
- openstack_message_queue
- linux_system_codename_xenial
interfaces:
- ens2:
- role: single_dhcp
ens3:
role: single_ctl
@@ -93,8 +83,6 @@
- openstack_message_queue
- linux_system_codename_xenial
interfaces:
- ens2:
- role: single_dhcp
ens3:
role: single_ctl
@@ -104,8 +92,6 @@
- openstack_proxy
- linux_system_codename_xenial
interfaces:
- ens2:
- role: single_dhcp
ens3:
role: single_ctl
@@ -115,16 +101,32 @@
- openstack_proxy
- linux_system_codename_xenial
interfaces:
- ens2:
- role: single_dhcp
ens3:
role: single_ctl
-# bmk01.cookied-bm-mcp-dvr-vxlan.local:
-# reclass_storage_name: openstack_benchmark_node01
-# roles:
-# - openstack_benchmark
-# - linux_system_codename_xenial
-# interfaces:
-# ens3:
-# role: single_ctl
\ No newline at end of file
+ mtr01.cookied-bm-mcp-dvr-vxlan.local:
+ reclass_storage_name: stacklight_telemetry_node01
+ roles:
+ - stacklight_telemetry
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_ctl
+
+ mtr02.cookied-bm-mcp-dvr-vxlan.local:
+ reclass_storage_name: stacklight_telemetry_node02
+ roles:
+ - stacklight_telemetry
+ - 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