Modifying new cookied model for baremetal

Removing openstack_telemetry (mdb) nodes due to this merge
https://github.com/Mirantis/mk2x-cookiecutter-reclass-model/commit/6191e302eecaf62451415ec2eeea992b28d11f71
Hack virouter
reboot cmp
change cookiecutter-contex to another file (with dpdk)
Change stacklight VIP determining
Move cinder lvm to computes
Add workarounds for cinder backend

Change-Id: I9bfe68a91723563bbd1507d6468b8f4b9efe2861
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-environment.yaml
index 53417f2..98eaa56 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-environment.yaml
@@ -181,7 +181,6 @@
         eth1:

           role: single_ctl

 

-

     mtr01.cookied-bm-mcp-ocata-contrail.local:

       reclass_storage_name: stacklight_telemetry_node01

       roles:

@@ -235,3 +234,12 @@
       interfaces:

         ens3:

           role: single_ctl

+

+    bmk01.cookied-bm-mcp-ocata-contrail.local:

+      reclass_storage_name: openstack_benchmark_node01

+      roles:

+      - openstack_benchmark

+      - linux_system_codename_xenial

+      interfaces:

+        ens3:

+          role: single_ctl