diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-dvr-vxlan/salt-context-vcp-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-dvr-vxlan/salt-context-vcp-environment.yaml
new file mode 100644
index 0000000..ba40edc
--- /dev/null
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-dvr-vxlan/salt-context-vcp-environment.yaml
@@ -0,0 +1,125 @@
+nodes:
+    ctl01.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_control_node01
+      roles:
+      - openstack_control_leader
+      - features_designate
+      - features_designate_keystone
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    ctl02.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_control_node02
+      roles:
+      - openstack_control
+      - features_designate
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    ctl03.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_control_node03
+      roles:
+      - openstack_control
+      - features_designate
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    dbs01.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_database_node01
+      roles:
+      - openstack_database_leader
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    dbs02.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_database_node02
+      roles:
+      - openstack_database
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    dbs03.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_database_node03
+      roles:
+      - openstack_database
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    msg01.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_message_queue_node01
+      roles:
+      - openstack_message_queue
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    msg02.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_message_queue_node02
+      roles:
+      - openstack_message_queue
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    msg03.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_message_queue_node03
+      roles:
+      - openstack_message_queue
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    prx01.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_proxy_node01
+      roles:
+      - openstack_proxy
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl
+
+    prx02.cookied-bm-mcp-ocata-dvr-vxlan.local:
+      reclass_storage_name: openstack_proxy_node02
+      roles:
+      - openstack_proxy
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_dhcp
+        ens3:
+          role: single_vlan_ctl