79 files changed, 238 insertions, 238 deletions

diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
index b721db431..547bc2972 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: baremetal-mcp-pike-ovs-ha.local
+  domain: mcp-pike-ovs-ha.local
   states:
     - maas
     - baremetal_init
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
index eec97eb96..a7ecba7fc 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: baremetal-mcp-pike-ovs-dpdk-ha.local
+  domain: mcp-pike-ovs-dpdk-ha.local
   states:
     - maas
     - baremetal_init
diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
index a72c00d7d..7cf1033a4 100644
--- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: baremetal-mcp-pike-odl-ha.local
+  domain: mcp-pike-odl-ha.local
   states:
     - maas
     - baremetal_init
diff --git a/mcp/reclass/classes/cluster/README.rst b/mcp/reclass/classes/cluster/README.rst
index dc09cfbac..0384c6d26 100644
--- a/mcp/reclass/classes/cluster/README.rst
+++ b/mcp/reclass/classes/cluster/README.rst
@@ -8,16 +8,16 @@ Fuel@OPNFV Cluster Reclass Models
 Overview
 --------
 
-#. Common classes (baremetal + virtual)
+#. Common classes (HA + noHA)
 
    - all-mcp-arch-common
 
-#. Common classes (specific to either baremetal or virtual deploys)
+#. Common classes (HA baremetal/virtual, noHA baremetal)
 
-   - baremetal-mcp-<release>-common-ha
+   - mcp-<release>-common-ha
    - virtual-mcp-<release>-common-noha
 
 #. Cluster specific classes
 
-   - baremetal-mcp-<release>-*-{ha,noha}
+   - mcp-<release>-*-{ha,noha}
    - virtual-mcp-<release>-*-{ha,noha}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/init.yml
deleted file mode 100644
index 014c57ffa..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/init.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra
-  - cluster.baremetal-mcp-pike-odl-ha.openstack
-parameters:
-  _param:
-    cluster_name: baremetal-mcp-pike-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml
deleted file mode 100644
index 8585c6915..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_database
-  - cluster.baremetal-mcp-pike-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml
deleted file mode 100644
index dfe1e28ca..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_message_queue
-  - cluster.baremetal-mcp-pike-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml
deleted file mode 100644
index 83d1be89a..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_telemetry
-  - cluster.baremetal-mcp-pike-odl-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml
deleted file mode 100644
index 86b4038c2..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_database
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml
deleted file mode 100644
index ad9336faa..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_message_queue
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml
deleted file mode 100644
index de960d976..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_triport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_proxy
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml
deleted file mode 100644
index 680efa871..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_telemetry
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/init.yml
deleted file mode 100644
index 2f62c0165..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/init.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra
-  - cluster.baremetal-mcp-pike-ovs-ha.openstack
-parameters:
-  _param:
-    cluster_name: baremetal-mcp-pike-ovs-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml
deleted file mode 100644
index 85f5ebcab..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_database
-  - cluster.baremetal-mcp-pike-ovs-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml
deleted file mode 100644
index 745fd6fd8..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_message_queue
-  - cluster.baremetal-mcp-pike-ovs-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml
deleted file mode 100644
index 5c91f605f..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_triport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_proxy
-  - cluster.baremetal-mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml
deleted file mode 100644
index c6b111939..000000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_telemetry
-  - cluster.baremetal-mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/proxy.yml
index 3c324db8b..3c324db8b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/include/proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/proxy.yml
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
index 4d7fa1eb1..0fb8e6418 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
@@ -25,7 +25,7 @@ classes:
   # - system.reclass.storage.system.stacklight_monitor_cluster
   # - system.reclass.storage.system.stacklight_telemetry_cluster
   - system.reclass.storage.system.infra_maas_single
-  - cluster.baremetal-mcp-pike-common-ha.infra.lab_proxy_pdf
+  - cluster.mcp-pike-common-ha.infra.lab_proxy_pdf
 parameters:
   _param:
     salt_master_base_environment: prd
@@ -117,7 +117,7 @@ parameters:
         #     - system.kibana.client.single
         openstack_control_node01:
           classes:
-            - cluster.baremetal-mcp-pike-common-ha.openstack_control_init
+            - cluster.mcp-pike-common-ha.openstack_control_init
           params:
             linux_system_codename: xenial
         openstack_control_node02:
@@ -128,7 +128,7 @@ parameters:
             linux_system_codename: xenial
         openstack_database_node01:
           classes:
-            - cluster.baremetal-mcp-pike-common-ha.openstack_database_init
+            - cluster.mcp-pike-common-ha.openstack_database_init
           params:
             linux_system_codename: xenial
         openstack_database_node02:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml
index 7d513e9bf..6f09a1adc 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml
@@ -9,8 +9,8 @@
 classes:
   - system.linux.system.single
   - cluster.all-mcp-arch-common
-  # - cluster.baremetal-mcp-pike-common-ha.stacklight
-  # - cluster.baremetal-mcp-pike-common-ha.stacklight.client
+  # - cluster.mcp-pike-common-ha.stacklight
+  # - cluster.mcp-pike-common-ha.stacklight.client
 parameters:
   _param:
     apt_mk_version: stable
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
index 1e6b3bd0d..a933adf48 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
@@ -21,8 +21,8 @@ classes:
   # - system.salt.control.cluster.stacklight_server_cluster
   # - system.salt.control.cluster.stacklight_log_cluster
   # - system.salt.control.cluster.stacklight_telemetry_cluster
-  - cluster.baremetal-mcp-pike-common-ha.infra.kvm_pdf
-  - cluster.baremetal-mcp-pike-common-ha.include.proxy
+  - cluster.mcp-pike-common-ha.infra.kvm_pdf
+  - cluster.mcp-pike-common-ha.include.proxy
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2
index 0d86a086e..0d86a086e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2
index 0e95d2d1d..0e95d2d1d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/lab_proxy_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
index da28abf06..1fd5987b8 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
@@ -9,7 +9,7 @@
 classes:
   - system.maas.region.single
   - service.maas.cluster.single
-  - cluster.baremetal-mcp-pike-common-ha.infra.lab_proxy_pdf
+  - cluster.mcp-pike-common-ha.infra.lab_proxy_pdf
 parameters:
   _param:
     dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
index a0cdd98c8..f2cf257eb 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
@@ -17,8 +17,8 @@ classes:
   - system.cinder.volume.single
   - system.cinder.volume.backend.lvm
   - system.ceilometer.agent.cluster
-  - cluster.baremetal-mcp-pike-common-ha.openstack_compute_pdf
-  - cluster.baremetal-mcp-pike-common-ha.include.proxy
+  - cluster.mcp-pike-common-ha.openstack_compute_pdf
+  - cluster.mcp-pike-common-ha.include.proxy
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_control_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
index ed9ddd6b4..ed9ddd6b4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml
index cf09a4123..cf09a4123 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml
index deb4cd7e9..deb4cd7e9 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database.yml
index 17c4e1cf6..17c4e1cf6 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database.yml
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database_init.yml
index 731fe6ed6..731fe6ed6 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database_init.yml
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml
index 8f4edefea..8f4edefea 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml
index f0fabbafa..572aa7d25 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.include.proxy
+  - cluster.mcp-pike-common-ha.include.proxy
 parameters:
   _param:
     dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml
index 47f2f76f4..c1fd625bc 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.include.proxy
+  - cluster.mcp-pike-common-ha.include.proxy
 parameters:
   _param:
     dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_message_queue.yml
index 13f8e5a13..13f8e5a13 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_message_queue.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_message_queue.yml
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml
index f83590ced..f83590ced 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml
index 94c0ce468..94c0ce468 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml
index d9f723a7c..15f8f056f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.reclass.storage.system.opendaylight_control_single
-  - cluster.baremetal-mcp-pike-common-ha.infra.config
-  - cluster.baremetal-mcp-pike-odl-ha.infra
+  - cluster.mcp-pike-common-ha.infra.config
+  - cluster.mcp-pike-odl-ha.infra
 parameters:
   reclass:
     storage:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml
index fb55539f5..08303b9ac 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml
@@ -7,5 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra.maas
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
+  - cluster.mcp-pike-common-ha.infra
+  - cluster.mcp-pike-odl-ha.openstack
+parameters:
+  _param:
+    cluster_name: mcp-pike-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
index bbc80e271..536963c00 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra.kvm
-  - cluster.baremetal-mcp-pike-odl-ha.infra
+  - cluster.mcp-pike-common-ha.infra.kvm
+  - cluster.mcp-pike-odl-ha.infra
 parameters:
   salt:
     control:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
index 4bb3d74f7..3fea28943 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra.maas
-  - cluster.baremetal-mcp-pike-ovs-ha.infra
+  - cluster.mcp-pike-common-ha.infra.maas
+  - cluster.mcp-pike-odl-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/init.yml
index 12a3ea211..add207769 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/init.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - cluster.all-mcp-arch-common
-  - cluster.baremetal-mcp-pike-ovs-ha.infra
-  - cluster.baremetal-mcp-pike-ovs-ha.openstack
+  - cluster.mcp-pike-odl-ha.infra
+  - cluster.mcp-pike-odl-ha.openstack
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml
index 50eb342e5..9e38d4adb 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.opendaylight.server.single
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-odl-ha
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-odl-ha
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml
index 473b3ff48..8fd376997 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_compute
-  - cluster.baremetal-mcp-pike-odl-ha.openstack.compute_pdf
-  - cluster.baremetal-mcp-pike-odl-ha.infra
+  - cluster.mcp-pike-common-ha.openstack_compute
+  - cluster.mcp-pike-odl-ha.openstack.compute_pdf
+  - cluster.mcp-pike-odl-ha.infra
   - system.neutron.gateway.opendaylight.single
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
index 4e0f7d147..4e0f7d147 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml
index 2cbb8cae9..0b40e613c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml
@@ -8,9 +8,9 @@
 ---
 classes:
   - system.neutron.control.opendaylight.cluster
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_control
-  - cluster.baremetal-mcp-pike-odl-ha.infra
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_control
+  - cluster.mcp-pike-odl-ha.infra
 parameters:
   neutron:
     server:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml
index bb2087d70..732c4c799 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml
@@ -7,5 +7,6 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra.kvm
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_database
+  - cluster.mcp-pike-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml
index 0859dc9f0..7820a0140 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_init
+  - cluster.mcp-pike-common-ha.openstack_init
 parameters:
   _param:
     # opendaylight options
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml
new file mode 100644
index 000000000..59bd52765
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_message_queue
+  - cluster.mcp-pike-odl-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
index 023ffd484..287617774 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_triport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_proxy
-  - cluster.baremetal-mcp-pike-odl-ha.infra
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_triport
+  - cluster.mcp-pike-common-ha.openstack_proxy
+  - cluster.mcp-pike-odl-ha.infra
 parameters:
   nginx:
     server:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml
new file mode 100644
index 000000000..b0dff05ef
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_telemetry
+  - cluster.mcp-pike-odl-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml
index 5835110f4..0ceb43f4d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml
@@ -7,6 +7,6 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra.config
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
+  - cluster.mcp-pike-common-ha.infra.config
+  - cluster.mcp-pike-ovs-dpdk-ha.infra
   - cluster.all-mcp-arch-common.infra.config_dpdk_pdf
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml
index e3dd53629..6b0ae2d1d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml
@@ -7,11 +7,11 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.openstack
+  - cluster.mcp-pike-common-ha.infra
+  - cluster.mcp-pike-ovs-dpdk-ha.openstack
 parameters:
   _param:
-    cluster_name: baremetal-mcp-pike-ovs-dpdk-ha
+    cluster_name: mcp-pike-ovs-dpdk-ha
   linux:
     system:
       service:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml
index b4c2a67ac..115aabbcf 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra.kvm
-  - cluster.baremetal-mcp-pike-ovs-ha.infra
+  - cluster.mcp-pike-common-ha.infra.kvm
+  - cluster.mcp-pike-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml
index f58e632c7..63081437a 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra.maas
-  - cluster.baremetal-mcp-pike-odl-ha.infra
+  - cluster.mcp-pike-common-ha.infra.maas
+  - cluster.mcp-pike-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/init.yml
index e0d15e607..85417d69a 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/init.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - cluster.all-mcp-arch-common
-  - cluster.baremetal-mcp-pike-odl-ha.infra
-  - cluster.baremetal-mcp-pike-odl-ha.openstack
+  - cluster.mcp-pike-ovs-dpdk-ha.infra
+  - cluster.mcp-pike-ovs-dpdk-ha.openstack
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute.yml
index efb67e130..13fffeaaa 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_compute
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.openstack.compute_pdf
+  - cluster.mcp-pike-common-ha.openstack_compute
+  - cluster.mcp-pike-ovs-dpdk-ha.infra
+  - cluster.mcp-pike-ovs-dpdk-ha.openstack.compute_pdf
   - system.neutron.compute.nfv.dpdk
 parameters:
   neutron:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
index 475f3a0fa..475f3a0fa 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml
index 82db9be87..243b13eaf 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml
@@ -8,9 +8,9 @@
 ---
 classes:
   - system.neutron.control.openvswitch.cluster
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_control
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_control
+  - cluster.mcp-pike-ovs-dpdk-ha.infra
 parameters:
   neutron:
     server:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml
new file mode 100644
index 000000000..594fc8be0
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_database
+  - cluster.mcp-pike-ovs-dpdk-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
index 49af851cc..d311be390 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_init
+  - cluster.mcp-pike-common-ha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml
new file mode 100644
index 000000000..1fd93d389
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_message_queue
+  - cluster.mcp-pike-ovs-dpdk-ha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml
new file mode 100644
index 000000000..047a8c77b
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_triport
+  - cluster.mcp-pike-common-ha.openstack_proxy
+  - cluster.mcp-pike-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml
new file mode 100644
index 000000000..d27411ee7
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_telemetry
+  - cluster.mcp-pike-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/config.yml
index 1a55d7807..6dac70cd1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/config.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.infra.config
-  - cluster.baremetal-mcp-pike-ovs-ha.infra
+  - cluster.mcp-pike-common-ha.infra.config
+  - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init.yml
new file mode 100644
index 000000000..7b8407b5e
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.infra
+  - cluster.mcp-pike-ovs-ha.openstack
+parameters:
+  _param:
+    cluster_name: mcp-pike-ovs-ha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml
new file mode 100644
index 000000000..a83e7c2f1
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml
@@ -0,0 +1,11 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.infra.kvm
+  - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml
new file mode 100644
index 000000000..544d0864f
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml
@@ -0,0 +1,11 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.infra.maas
+  - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/init.yml
index ab450e045..4a5c9cd75 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/init.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - cluster.all-mcp-arch-common
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.openstack
+  - cluster.mcp-pike-ovs-ha.infra
+  - cluster.mcp-pike-ovs-ha.openstack
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute.yml
index 5914f50be..66531db8f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_compute
-  - cluster.baremetal-mcp-pike-ovs-ha.openstack.compute_pdf
-  - cluster.baremetal-mcp-pike-ovs-ha.infra
+  - cluster.mcp-pike-common-ha.openstack_compute
+  - cluster.mcp-pike-ovs-ha.openstack.compute_pdf
+  - cluster.mcp-pike-ovs-ha.infra
 parameters:
   nova:
     compute:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
index 4e0f7d147..4e0f7d147 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml
index 43bec6bcc..acbab294e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml
@@ -8,6 +8,6 @@
 ---
 classes:
   - system.neutron.control.openvswitch.cluster
-  - cluster.baremetal-mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.baremetal-mcp-pike-common-ha.openstack_control
-  - cluster.baremetal-mcp-pike-ovs-ha.infra
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_control
+  - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml
new file mode 100644
index 000000000..5ff755396
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_database
+  - cluster.mcp-pike-ovs-ha
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml
index f1c8b93a4..e7f4df997 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-common-ha.openstack_init
+  - cluster.mcp-pike-common-ha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml
new file mode 100644
index 000000000..859a7422b
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_message_queue
+  - cluster.mcp-pike-ovs-ha
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml
new file mode 100644
index 000000000..bf160ec93
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_triport
+  - cluster.mcp-pike-common-ha.openstack_proxy
+  - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml
new file mode 100644
index 000000000..7d92e2a2f
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml
@@ -0,0 +1,12 @@
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+classes:
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_telemetry
+  - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.local.yml
index dc9c8c748..cbab34b45 100644
--- a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-ha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-ovs-ha.infra.config
+  - cluster.mcp-pike-odl-ha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: baremetal-mcp-pike-ovs-ha.local
+      domain: mcp-pike-odl-ha.local
diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-odl-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.local.yml
index fb067f038..c31233bb5 100644
--- a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-odl-ha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-odl-ha.infra.config
+  - cluster.mcp-pike-ovs-dpdk-ha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: baremetal-mcp-pike-odl-ha.local
+      domain: mcp-pike-ovs-dpdk-ha.local
diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-dpdk-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml
index df38d09b8..f5e3bb0be 100644
--- a/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-dpdk-ha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra.config
+  - cluster.mcp-pike-ovs-ha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: baremetal-mcp-pike-ovs-dpdk-ha.local
+      domain: mcp-pike-ovs-ha.local