diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-environment.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-environment.yaml
new file mode 100644
index 0000000..93ee70a
--- /dev/null
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-environment.yaml
@@ -0,0 +1,96 @@
+nodes:
+    cfg01.bm-e7-cicd-pike-odl-maas.local:
+      reclass_storage_name: infra_config_node01
+      roles:
+      - infra_config
+      - linux_system_codename_xenial
+      - features_runtest_cfg
+      interfaces:
+        ens3:
+          role: single_static_mgm
+
+    # Physical nodes
+    kvm01.bm-e7-cicd-pike-odl-maas.local:
+      reclass_storage_name: infra_kvm_node01
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        one1:
+          role: single_mgm_dhcp
+        ten1:
+          role: bond_ctl_lacp
+        ten2:
+          role: bond_ctl_lacp
+
+    kvm02.bm-e7-cicd-pike-odl-maas.local:
+      reclass_storage_name: infra_kvm_node02
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        one1:
+          role: single_mgm_dhcp
+        ten1:
+          role: bond_ctl_lacp
+        ten2:
+          role: bond_ctl_lacp
+
+    kvm03.bm-e7-cicd-pike-odl-maas.local:
+      reclass_storage_name: infra_kvm_node03
+      roles:
+      - infra_kvm
+      - linux_system_codename_xenial
+      interfaces:
+        one1:
+          role: single_mgm_dhcp
+        ten1:
+          role: bond_ctl_lacp
+        ten2:
+          role: bond_ctl_lacp
+
+    cmp<<count>>:
+      reclass_storage_name: openstack_compute_rack01
+      roles:
+      - openstack_compute
+      - linux_system_codename_xenial
+      interfaces:
+        one1:
+          role: single_mgm_dhcp
+        ten1:
+          role: bond_ctl_lacp
+        ten2:
+          role: bond_ctl_lacp
+
+    gtw01.bm-e7-cicd-pike-odl-maas.local:
+      reclass_storage_name: openstack_gateway_node01
+      roles:
+      - openstack_gateway
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_mgm_dhcp
+        ens3:
+          role: single_ctl
+
+    gtw02.bm-e7-cicd-pike-odl-maas.local:
+      reclass_storage_name: openstack_gateway_node02
+      roles:
+      - openstack_gateway
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_mgm_dhcp
+        ens3:
+          role: single_ctl
+
+    gtw03.bm-e7-cicd-pike-odl-maas.local:
+      reclass_storage_name: openstack_gateway_node03
+      roles:
+      - openstack_gateway
+      - linux_system_codename_xenial
+      interfaces:
+        ens2:
+          role: single_mgm_dhcp
+        ens3:
+          role: single_ctl