diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index 7f9da05..9da4945 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -33,6 +33,8 @@
           enabled: ${_param:kubernetes_virtlet_enabled}
           namespace: ${_param:kubernetes_addon_namespace}
           image: ${_param:kubernetes_virtlet_image}
+          criproxy_version: ${_param:kubernetes_criproxy_version}
+          criproxy_source: ${_param:kubernetes_criproxy_checksum}
           hosts:
           - ${linux:system:name}
       hyperkube:
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index d90145d..42fc07e 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -23,8 +23,10 @@
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
 
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_criproxy_version: v0.9.4
+    kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
     kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
index 2dd76cc..7a7e9c3 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
@@ -19,7 +19,7 @@
     kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
     kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
     kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
index f520941..198c172 100644
--- a/classes/cluster/k8s-compact/kubernetes/compute.yml
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -27,6 +27,8 @@
           enabled: ${_param:kubernetes_virtlet_enabled}
           namespace: ${_param:kubernetes_addon_namespace}
           image: ${_param:kubernetes_virtlet_image}
+          criproxy_version: ${_param:kubernetes_criproxy_version}
+          criproxy_source: ${_param:kubernetes_criproxy_checksum}
           hosts:
           - kube01
       hyperkube:
diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index 70b2cf9..d0c3740 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -31,8 +31,10 @@
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
-    kubernetes_hyperkube_image: docker-prod-local.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-local.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_criproxy_version: v0.9.4
+    kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
     kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index c51a90c..77b7cc9 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -10,7 +10,7 @@
     kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
   docker:
     host:
       pkgs:
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index 19a2961..2a6126f 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -10,7 +10,7 @@
     kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
   docker:
     host:
       pkgs:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index ea131dd..e18d628 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -34,6 +34,8 @@
           enabled: ${_param:kubernetes_virtlet_enabled}
           namespace: ${_param:kubernetes_addon_namespace}
           image: ${_param:kubernetes_virtlet_image}
+          criproxy_version: ${_param:kubernetes_criproxy_version}
+          criproxy_source: ${_param:kubernetes_criproxy_checksum}
           hosts:
           - ${_param:kubernetes_compute01_hostname}
       hyperkube:
@@ -58,4 +60,10 @@
             kubernetes_services:
               address: 10.254.0.0
               netmask: 255.255.0.0
-              gateway: ${_param:deploy_address}
\ No newline at end of file
+              gateway: ${_param:deploy_address}
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: '255.255.255.0'
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 8398678..1afffc1 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -26,8 +26,10 @@
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
 
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_criproxy_version: v0.9.4
+    kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
     kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 1b51aa8..db900d2 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -58,6 +58,8 @@
           enabled: ${_param:kubernetes_virtlet_enabled}
           namespace: ${_param:kubernetes_addon_namespace}
           image: ${_param:kubernetes_virtlet_image}
+          criproxy_version: ${_param:kubernetes_criproxy_version}
+          criproxy_source: ${_param:kubernetes_criproxy_checksum}
           hosts:
           - ${linux:system:name}
       hyperkube:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 801eeed..2a341ba 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -27,8 +27,10 @@
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
 
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_virtlet_image: mirantis/virtlet:latest
+    kubernetes_criproxy_version: v0.9.4
+    kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
     kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
     kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
     kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
index 0c101cc..34b32de 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.opencontrail.client.resource.edge_router
 - system.rabbitmq.server.cluster
 - system.opencontrail.control.cluster
diff --git a/classes/cluster/os-ha-contrail-40/.env b/classes/cluster/os-ha-contrail-40/.env
index 89b7f61..83ae21f 100644
--- a/classes/cluster/os-ha-contrail-40/.env
+++ b/classes/cluster/os-ha-contrail-40/.env
@@ -1,4 +1,4 @@
 EXTRA_FORMULAS="barbican linux salt reclass maas memcached openssh ntp sphinx \
         grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf \
         elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins \
-        gerrit artifactory influxdb horizon nginx collectd heka mysql nova"
+        gerrit artifactory influxdb horizon nginx collectd heka mysql nova opencontrail"
diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index 97f1070..dc238d6 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
diff --git a/classes/cluster/os-ha-contrail/.env b/classes/cluster/os-ha-contrail/.env
index 89b7f61..83ae21f 100644
--- a/classes/cluster/os-ha-contrail/.env
+++ b/classes/cluster/os-ha-contrail/.env
@@ -1,4 +1,4 @@
 EXTRA_FORMULAS="barbican linux salt reclass maas memcached openssh ntp sphinx \
         grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf \
         elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins \
-        gerrit artifactory influxdb horizon nginx collectd heka mysql nova"
+        gerrit artifactory influxdb horizon nginx collectd heka mysql nova opencontrail"
diff --git a/classes/cluster/os-ha-ovs-syndic/.env b/classes/cluster/os-ha-ovs-syndic/.env
new file mode 100644
index 0000000..b8847b6
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-syndic/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="nginx"
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index 04aaf6c..7faf456 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -10,7 +10,7 @@
     kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
   docker:
     host:
       pkgs:
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
index 672ed25..37b89f9 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
@@ -19,7 +19,7 @@
     kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
     kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
     kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/cephfs.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/cephfs.yml
new file mode 100644
index 0000000..7f02d7d
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/cephfs.yml
@@ -0,0 +1,2 @@
+classes:
+- cluster.virtual-mcp-ocata-dvr-ceph-local
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/common.yml
similarity index 76%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/common.yml
index 7da40e1..83d80d9 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/common.yml
@@ -1,6 +1,6 @@
 classes:
-- system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   ceph:
     common:
@@ -16,9 +16,9 @@
           name: ${_param:cinder_storage_user}
           caps:
             mon: "allow r"
-            osd: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rwx pool=images"
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rx pool=images"
         nova:
           name: ${_param:nova_storage_user}
           caps:
             mon: "allow r"
-            osd: "allow class-read object_prefix rbd_children, allow rwx pool=vms, allow rx pool=images, allow rwx pool=volumes"
\ No newline at end of file
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=vms, allow rx pool=images"
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/init.yml
new file mode 100644
index 0000000..2f0d2ec
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/init.yml
@@ -0,0 +1,48 @@
+parameters:
+  _param:
+    linux_repo_ceph_component: ${_param:ceph_version}
+    ceph_version: luminous
+    ceph_mon_node01_hostname: cmn01
+    ceph_mon_node02_hostname: cmn02
+    ceph_mon_node03_hostname: cmn03
+
+    ceph_osd_node01_hostname: osd01
+    ceph_osd_node02_hostname: osd02
+
+
+    ceph_osd_node01_address: 172.16.10.94
+    ceph_osd_node02_address: 172.16.10.95
+    ceph_mon_node01_address: 172.16.10.96
+    ceph_mon_node02_address: 172.16.10.97
+    ceph_mon_node03_address: 172.16.10.98
+
+    ceph_cluster_fsid: a619c5fc-c4ed-4f22-9ed2-66cf2feca23d
+
+  linux:
+    network:
+      host:
+        cmn01:
+          address: ${_param:ceph_mon_node01_address}
+          names:
+          - ${_param:ceph_mon_node01_hostname}
+          - ${_param:ceph_mon_node01_hostname}.${_param:cluster_domain}
+        cmn02:
+          address: ${_param:ceph_mon_node02_address}
+          names:
+          - ${_param:ceph_mon_node02_hostname}
+          - ${_param:ceph_mon_node02_hostname}.${_param:cluster_domain}
+        cmn03:
+          address: ${_param:ceph_mon_node03_address}
+          names:
+          - ${_param:ceph_mon_node03_hostname}
+          - ${_param:ceph_mon_node03_hostname}.${_param:cluster_domain}
+        osd01:
+          address: ${_param:ceph_osd_node01_address}
+          names:
+          - ${_param:ceph_osd_node01_hostname}
+          - ${_param:ceph_osd_node01_hostname}.${_param:cluster_domain}
+        osd02:
+          address: ${_param:ceph_osd_node02_address}
+          names:
+          - ${_param:ceph_osd_node02_hostname}
+          - ${_param:ceph_osd_node02_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/mon.yml
similarity index 65%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/mon.yml
index 2f46c26..87c5bb3 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/mon.yml
@@ -1,9 +1,8 @@
 classes:
 - system.ceph.mon.cluster
 - system.ceph.mgr.cluster
-- system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   linux:
     network:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/osd.yml
similarity index 60%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/osd.yml
index eac413b..18c9e45 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/osd.yml
@@ -1,8 +1,7 @@
 classes:
 - service.ceph.osd.cluster
-- system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   linux:
     network:
@@ -18,12 +17,9 @@
     osd:
       enabled: true
       crush_parent: ${_param:ceph_crush_parent}
-      bluestore_block_db_size: 900000000
-      bluestore_block_wal_size: 900000000
+      bluestore_block_db_size: 10073741824
       backend:
         bluestore:
           disks:
             - dev: /dev/vdb
               block_db: /dev/vdb
-            - dev: /dev/vdc
-              block_db: /dev/vdc
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/setup.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/setup.yml
new file mode 100644
index 0000000..f00eb17
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/ceph/setup.yml
@@ -0,0 +1,28 @@
+classes:
+- system.ceph.mon.cluster_init
+- cluster.virtual-mcp-ocata-dvr-ceph-local
+parameters:
+  ceph:
+    setup:
+      pool:
+        images:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          size: 2
+          application: rbd
+          crush_rule: sata
+        volumes:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          size: 2
+          application: rbd
+          crush_rule: sata
+        vms:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          size: 2
+          application: rbd
+          crush_rule: sata
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
similarity index 87%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
index a7c9444..03135b3 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
@@ -1,15 +1,13 @@
 classes:
 - service.git.client
 - system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.salt
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
-- system.reclass.storage.system.ceph_rgw_cluster
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
@@ -20,28 +18,27 @@
 - system.keystone.client.service.nova-placement
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.keystone.client.service.radosgw-swift
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-dvr-ceph-local.openstack.proxy
+- cluster.virtual-mcp-ocata-dvr-ceph-local.stacklight.proxy
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   _param:
-    reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+    reclass_data_repository: https://gerrit.mcp.mirantis.local.test/salt-models/mcp-virtual-lab
     reclass_data_revision: master
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     reclass_config_master: 192.168.10.90
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
       interface:
@@ -56,7 +53,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: ${_param:openstack_proxy_address}
+            host: prx
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:
@@ -163,21 +160,6 @@
           cluster_param:
             ceph_mon_node03_address:
               value_template: <<node_control_ip>>
-        ceph_rgw_node01:
-          expression: <<node_hostname>>__equals__rgw01
-          cluster_param:
-            ceph_rgw_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node02:
-          expression: <<node_hostname>>__equals__rgw02
-          cluster_param:
-            ceph_rgw_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_rgw_node03_address:
-              value_template: <<node_control_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -226,7 +208,7 @@
             external_address: 10.16.0.110
         openstack_proxy_node01:
           classes:
-          - cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
+          - cluster.virtual-mcp-ocata-dvr-ceph-local.openstack.proxy
           params:
             linux_system_codename: xenial
         infra_storage_rack01:
@@ -249,4 +231,4 @@
                 interpolate: true
           params:
             salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
+            linux_system_codename: xenial
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/init.yml
new file mode 100644
index 0000000..5b9d611
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/init.yml
@@ -0,0 +1,21 @@
+parameters:
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
+        cfg:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg
+          - cfg.${_param:cluster_domain}
+        apt:
+          address: ${_param:aptly_server_address}
+          names:
+          - apt
+          - apt.${_param:cluster_domain}
+    system:
+      purge_repos: True
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
similarity index 69%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
index 83d78df..c1ef8c6 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
@@ -3,7 +3,9 @@
 - service.grafana.collector
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
-- system.linux.system.repo.mcp.extra
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.prometheus.collector
@@ -11,52 +13,49 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight
+- cluster.virtual-mcp-ocata-dvr-ceph-local.infra
+- cluster.virtual-mcp-ocata-dvr-ceph-local.ceph
+- cluster.virtual-mcp-ocata-dvr-ceph-local.openstack
+- cluster.virtual-mcp-ocata-dvr-ceph-local.stacklight
+
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-dvr-ceph-rgw.local
-    cluster_name: virtual-mcp-ocata-dvr-ceph-rgw
-    # infra service addresses
+    local_repos: true
+    local_repo_url: mirror.mcp.mirantis.local.test
+    aptly_server_address: 10.170.0.242
+    linux_repo_refresh_db: true
+    cluster_domain: virtual-mcp-ocata-dvr-ceph-local.local
+    cluster_name: virtual-mcp-ocata-dvr-ceph-local
     infra_config_hostname: cfg01
+    # infra service addresses
     infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_database_address: 172.16.10.254
     openstack_proxy_address: 172.16.10.121
     openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
     openstack_control_node01_address: 172.16.10.101
     openstack_control_node02_address: 172.16.10.102
     openstack_control_node03_address: 172.16.10.103
+    openstack_gateway_address: 172.16.10.110
     openstack_database_address: ${_param:openstack_control_address}
-    openstack_database_node01_address: ${_param:openstack_control_node01_address}
-    openstack_database_node02_address: ${_param:openstack_control_node02_address}
-    openstack_database_node03_address: ${_param:openstack_control_node03_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-    openstack_gateway_address: 172.16.10.110
-    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
-    openstack_dns_node01_address: 172.16.10.111
-    openstack_dns_node02_address: 172.16.10.112
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     # ceph addresses
     ceph_osd_node01_address: 172.16.10.94
     ceph_osd_node02_address: 172.16.10.95
     ceph_mon_node01_address: 172.16.10.96
     ceph_mon_node02_address: 172.16.10.97
     ceph_mon_node03_address: 172.16.10.98
-    ceph_rgw_address: 10.60.0.75
-    ceph_rgw_node01_address: 10.60.0.76
-    ceph_rgw_node02_address: 10.60.0.77
-    ceph_rgw_node03_address: 10.60.0.78
+
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/compute.yml
similarity index 78%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/compute.yml
index 56d32f7..4d56bdc 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/compute.yml
@@ -1,18 +1,15 @@
 classes:
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.linux.network.hosts
+- system.linux.network.interface.single_ovs_dvr
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
 - system.ceilometer.agent.cluster
-- system.linux.network.interface.single_ovs_dvr
 - system.prometheus.exporters.libvirt
 - system.nova.compute.storage.ceph
 - system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-ocata-dvr-ceph-local.ceph.common
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   _param:
     primary_interface: ens4
@@ -20,21 +17,21 @@
     external_interface: ens6
     interface_mtu: 1500
     linux_system_codename: xenial
-  neutron:
-    compute:
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
   nova:
     compute:
       vncproxy_url: http://${_param:cluster_vip_address}:6080
-      message_queue:
-        members:
-          - host: ${_param:openstack_control_node01_address}
-          - host: ${_param:openstack_control_node02_address}
-          - host: ${_param:openstack_control_node03_address}
       notification:
         driver: messagingv2
         topics: "notifications,${_param:stacklight_notification_topic}"
         notify_on:
           state_change: vm_and_task_state
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
+  neutron:
+    compute:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/control.yml
similarity index 85%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/control.yml
index 3686c44..b2020e7 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/control.yml
@@ -1,9 +1,7 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
@@ -18,7 +16,6 @@
 - system.glance.control.cluster
 - system.nova.control.cluster
 - system.neutron.control.openvswitch.cluster
-- system.cinder.control.cluster
 - system.heat.server.cluster
 - system.ceilometer.server.cluster
 - system.ceilometer.server.backend.influxdb
@@ -36,14 +33,13 @@
 - system.haproxy.proxy.listen.openstack.nova-placement
 - system.glance.control.storage.ceph
 - system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-ocata-dvr-ceph-local.ceph.common
 - system.cinder.control.backend.ceph
 - system.cinder.control.cluster
 - system.cinder.control.notification.messagingv2
 - system.cinder.volume.single
 - system.cinder.volume.notification.messagingv2
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   _param:
     keepalived_vip_interface: ens4
@@ -94,10 +90,6 @@
       cpu_allocation: 54
       metadata:
         password: ${_param:metadata_password}
-      bind:
-        private_address: ${_param:cluster_local_address}
-        public_address: ${_param:cluster_vip_address}
-        novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
       notification:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/dashboard.yml
new file mode 100644
index 0000000..e38e134
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/dashboard.yml
@@ -0,0 +1,16 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.horizon.server.single
+- cluster.virtual-mcp-ocata-dvr-ceph-local
+parameters:
+  _param:
+    horizon_site_branding: OpenStack Dashboard
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/gateway.yml
similarity index 70%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/gateway.yml
index eaa543f..70214c2 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/gateway.yml
@@ -1,19 +1,17 @@
 classes:
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   _param:
     primary_interface: ens4
     tenant_interface: ens5
     external_interface: ens6
     interface_mtu: 9000
+    linux_system_codename: xenial
     neutron_gateway_dvr: True
     neutron_gateway_agent_mode: dvr_snat
-    linux_system_codename: xenial
   neutron:
     gateway:
       notification:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/init.yml
new file mode 100644
index 0000000..959cd33
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/init.yml
@@ -0,0 +1,151 @@
+parameters:
+  _param:
+    openstack_version: ocata
+    apt_mk_version: nightly
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    neutron_control_dvr: True
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: True
+    neutron_gateway_agent_mode: dvr_snat
+    neutron_compute_dvr: True
+    neutron_compute_agent_mode: dvr
+    neutron_compute_external_access: True
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: ${_param:cluster_vip_address}
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    metadata_password: workshop
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+    mysql_cinder_password: workshop
+    mysql_ceilometer_password: workshop
+    mysql_glance_password: workshop
+    mysql_grafana_password: workshop
+    mysql_heat_password: workshop
+    mysql_keystone_password: workshop
+    mysql_neutron_password: workshop
+    mysql_nova_password: workshop
+    mysql_aodh_password: workshop
+    keystone_service_token: workshop
+    keystone_admin_password: workshop
+    keystone_ceilometer_password: workshop
+    keystone_aodh_password: workshop
+    keystone_cinder_password: workshop
+    keystone_glance_password: workshop
+    keystone_heat_password: workshop
+    keystone_keystone_password: workshop
+    keystone_neutron_password: workshop
+    keystone_nova_password: workshop
+    ceilometer_secret_key: workshop
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 2
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
+    # Ceph
+    cinder_storage_secret_uuid: "6e84ffc6-512f-4c0f-b2b7-df67cce14bb6"
+    nova_storage_secret_uuid: "6e84ffc6-512f-4c0f-b2b7-df67cce14bb6"
+    nova_storage_pool: vms
+    nova_storage_user: nova
+    cinder_storage_pool: volumes
+    cinder_storage_user: cinder
+    glance_storage_pool: images
+    glance_storage_user: glance
+  linux:
+    network:
+      purge_hosts: true
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml
similarity index 83%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml
index a37f4fb..1f7a6ca 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml
@@ -3,9 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.ceph_radosgw
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   _param:
     nginx_proxy_ssl:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/client.yml
similarity index 94%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/client.yml
index ac069dd..3abfb47 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/client.yml
@@ -4,7 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/init.yml
new file mode 100644
index 0000000..883bad0
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/init.yml
@@ -0,0 +1,35 @@
+parameters:
+  _param:
+    linux_system_codename: xenial
+    prometheus_control_address: ${_param:stacklight_monitor_address}
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_port: 9200
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/proxy.yml
similarity index 92%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/proxy.yml
index 14634e8..e903e7e 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/proxy.yml
@@ -5,7 +5,7 @@
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   _param:
     nginx_proxy_grafana_port: 15013
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml
similarity index 66%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
copy to classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml
index d47b429..65cfd41 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml
@@ -1,9 +1,9 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
-- system.linux.system.repo.mcp.apt_mirantis.docker
+- system.linux.system.repo_local.mcp.apt_mirantis.influxdb
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana
+- system.linux.system.repo_local.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
@@ -27,7 +27,7 @@
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-dvr-ceph-local
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
@@ -45,14 +45,14 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-    docker_image_alertmanager: docker-prod-local.artifactory.mirantis.com/openstack-docker/alertmanager:${_param:apt_mk_version}
-    docker_image_pushgateway: docker-prod-local.artifactory.mirantis.com/openstack-docker/pushgateway:${_param:apt_mk_version}
-    docker_image_prometheus: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus:${_param:apt_mk_version}
-    docker_image_remote_agent: docker-prod-local.artifactory.mirantis.com/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
-    docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
-    docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
-    docker_image_grafana: grafana/grafana:4.5.2
+    docker_image_alertmanager: apt:5000/alertmanager:${_param:apt_mk_version}
+    docker_image_pushgateway: apt:5000/pushgateway:${_param:apt_mk_version}
+    docker_image_prometheus: apt:5000/prometheus:${_param:apt_mk_version}
+    docker_image_remote_agent: apt:5000/telegraf:${_param:apt_mk_version}
+    docker_image_remote_storage_adapter: apt:5000/remote_storage_adapter:${_param:apt_mk_version}
+    docker_image_remote_collector: apt:5000/heka:${_param:apt_mk_version}
+    docker_image_prometheus_relay: apt:5000/prometheus_relay:${_param:apt_mk_version}
+    docker_image_grafana: apt:5000/grafana:${_param:apt_mk_version}
     influxdb_port: 8086
     influxdb_admin_password: password
     influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index e206416..90e94f8 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -2,7 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
index 674a87a..4276967 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
index 869f316..1be2cd0 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
@@ -1,9 +1,9 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml
index 8bd69d9..eac5239 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml
@@ -1,8 +1,8 @@
 classes:
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.horizon.server.single
 - cluster.virtual-mcp-ocata-dvr
 parameters:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/gateway.yml
index 9f1fa83..307741e 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp-ocata-dvr
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index 564bad5..221dbc6 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     openstack_version: ocata
-    apt_mk_version: nightly
+    apt_mk_version: 2017.12
     mcp_repo_version: 1.1
     openstack_region: RegionOne
     admin_email: root@localhost
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
index 0f278aa..586cad0 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
@@ -1,10 +1,10 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.influxdb
-- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.elastic
 - system.linux.system.repo.mcp.apt_mirantis.kibana
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
@@ -46,14 +46,14 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-    docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
-    docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
-    docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
-    docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
-    docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
-    docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
-    docker_image_grafana: grafana/grafana:4.5.2
+    docker_image_alertmanager: docker-prod-local.artifactory.mirantis.com/openstack-docker/alertmanager:${_param:apt_mk_version}
+    docker_image_pushgateway: docker-prod-local.artifactory.mirantis.com/openstack-docker/pushgateway:${_param:apt_mk_version}
+    docker_image_prometheus: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus:${_param:apt_mk_version}
+    docker_image_remote_agent: docker-prod-local.artifactory.mirantis.com/openstack-docker/telegraf:${_param:apt_mk_version}
+    docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
+    docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
+    docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
+    docker_image_grafana: docker-prod-local.artifactory.mirantis.com/mirantis/external/grafana:${_param:apt_mk_version}
     influxdb_port: 8086
     influxdb_admin_password: password
     influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/cephfs.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/cephfs.yml
new file mode 100644
index 0000000..3932f75
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/cephfs.yml
@@ -0,0 +1,2 @@
+classes:
+- cluster.virtual-mcp-ocata-ovs-ceph-local
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/common.yml
similarity index 76%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/common.yml
index 7da40e1..e67ef52 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/common.yml
@@ -1,6 +1,6 @@
 classes:
-- system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- cluster.virtual-mcp-ocata-ovs-ceph-local
 parameters:
   ceph:
     common:
@@ -16,9 +16,9 @@
           name: ${_param:cinder_storage_user}
           caps:
             mon: "allow r"
-            osd: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rwx pool=images"
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rx pool=images"
         nova:
           name: ${_param:nova_storage_user}
           caps:
             mon: "allow r"
-            osd: "allow class-read object_prefix rbd_children, allow rwx pool=vms, allow rx pool=images, allow rwx pool=volumes"
\ No newline at end of file
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=vms, allow rx pool=images"
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/init.yml
new file mode 100644
index 0000000..2f0d2ec
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/init.yml
@@ -0,0 +1,48 @@
+parameters:
+  _param:
+    linux_repo_ceph_component: ${_param:ceph_version}
+    ceph_version: luminous
+    ceph_mon_node01_hostname: cmn01
+    ceph_mon_node02_hostname: cmn02
+    ceph_mon_node03_hostname: cmn03
+
+    ceph_osd_node01_hostname: osd01
+    ceph_osd_node02_hostname: osd02
+
+
+    ceph_osd_node01_address: 172.16.10.94
+    ceph_osd_node02_address: 172.16.10.95
+    ceph_mon_node01_address: 172.16.10.96
+    ceph_mon_node02_address: 172.16.10.97
+    ceph_mon_node03_address: 172.16.10.98
+
+    ceph_cluster_fsid: a619c5fc-c4ed-4f22-9ed2-66cf2feca23d
+
+  linux:
+    network:
+      host:
+        cmn01:
+          address: ${_param:ceph_mon_node01_address}
+          names:
+          - ${_param:ceph_mon_node01_hostname}
+          - ${_param:ceph_mon_node01_hostname}.${_param:cluster_domain}
+        cmn02:
+          address: ${_param:ceph_mon_node02_address}
+          names:
+          - ${_param:ceph_mon_node02_hostname}
+          - ${_param:ceph_mon_node02_hostname}.${_param:cluster_domain}
+        cmn03:
+          address: ${_param:ceph_mon_node03_address}
+          names:
+          - ${_param:ceph_mon_node03_hostname}
+          - ${_param:ceph_mon_node03_hostname}.${_param:cluster_domain}
+        osd01:
+          address: ${_param:ceph_osd_node01_address}
+          names:
+          - ${_param:ceph_osd_node01_hostname}
+          - ${_param:ceph_osd_node01_hostname}.${_param:cluster_domain}
+        osd02:
+          address: ${_param:ceph_osd_node02_address}
+          names:
+          - ${_param:ceph_osd_node02_hostname}
+          - ${_param:ceph_osd_node02_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/mon.yml
similarity index 65%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/mon.yml
index 2f46c26..762537d 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/mon.yml
@@ -1,9 +1,8 @@
 classes:
 - system.ceph.mon.cluster
 - system.ceph.mgr.cluster
-- system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- cluster.virtual-mcp-ocata-ovs-ceph-local
 parameters:
   linux:
     network:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/osd.yml
similarity index 60%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/osd.yml
index eac413b..e4b1cf2 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/osd.yml
@@ -1,8 +1,7 @@
 classes:
 - service.ceph.osd.cluster
-- system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- cluster.virtual-mcp-ocata-ovs-ceph-local
 parameters:
   linux:
     network:
@@ -18,12 +17,9 @@
     osd:
       enabled: true
       crush_parent: ${_param:ceph_crush_parent}
-      bluestore_block_db_size: 900000000
-      bluestore_block_wal_size: 900000000
+      bluestore_block_db_size: 10073741824
       backend:
         bluestore:
           disks:
             - dev: /dev/vdb
               block_db: /dev/vdb
-            - dev: /dev/vdc
-              block_db: /dev/vdc
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/setup.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/setup.yml
new file mode 100644
index 0000000..7f33064
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/ceph/setup.yml
@@ -0,0 +1,28 @@
+classes:
+- system.ceph.mon.cluster_init
+- cluster.virtual-mcp-ocata-ovs-ceph-local
+parameters:
+  ceph:
+    setup:
+      pool:
+        images:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          size: 2
+          application: rbd
+          crush_rule: sata
+        volumes:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          size: 2
+          application: rbd
+          crush_rule: sata
+        vms:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          size: 2
+          application: rbd
+          crush_rule: sata
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
similarity index 86%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
index a7c9444..d9c1364 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
@@ -1,15 +1,13 @@
 classes:
 - service.git.client
 - system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.salt
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
-- system.reclass.storage.system.ceph_rgw_cluster
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
@@ -20,28 +18,27 @@
 - system.keystone.client.service.nova-placement
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.keystone.client.service.radosgw-swift
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-ovs-ceph-local.openstack.proxy
+- cluster.virtual-mcp-ocata-ovs-ceph-local.stacklight.proxy
+- cluster.virtual-mcp-ocata-ovs-ceph-local
 parameters:
   _param:
-    reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+    reclass_data_repository: https://gerrit.mcp.mirantis.local.test/salt-models/mcp-virtual-lab
     reclass_data_revision: master
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     reclass_config_master: 192.168.10.90
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
       interface:
@@ -56,7 +53,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: ${_param:openstack_proxy_address}
+            host: prx
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:
@@ -163,21 +160,6 @@
           cluster_param:
             ceph_mon_node03_address:
               value_template: <<node_control_ip>>
-        ceph_rgw_node01:
-          expression: <<node_hostname>>__equals__rgw01
-          cluster_param:
-            ceph_rgw_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node02:
-          expression: <<node_hostname>>__equals__rgw02
-          cluster_param:
-            ceph_rgw_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_rgw_node03_address:
-              value_template: <<node_control_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -226,7 +208,7 @@
             external_address: 10.16.0.110
         openstack_proxy_node01:
           classes:
-          - cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
+          - cluster.virtual-mcp-ocata-ovs-ceph-local.openstack.proxy
           params:
             linux_system_codename: xenial
         infra_storage_rack01:
@@ -249,4 +231,4 @@
                 interpolate: true
           params:
             salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
+            linux_system_codename: xenial
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/init.yml
new file mode 100644
index 0000000..5b9d611
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/init.yml
@@ -0,0 +1,21 @@
+parameters:
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
+        cfg:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg
+          - cfg.${_param:cluster_domain}
+        apt:
+          address: ${_param:aptly_server_address}
+          names:
+          - apt
+          - apt.${_param:cluster_domain}
+    system:
+      purge_repos: True
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
similarity index 69%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
index 83d78df..5affb23 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
@@ -3,7 +3,9 @@
 - service.grafana.collector
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
-- system.linux.system.repo.mcp.extra
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.prometheus.collector
@@ -11,52 +13,49 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight
+- cluster.virtual-mcp-ocata-ovs-ceph-local.infra
+- cluster.virtual-mcp-ocata-ovs-ceph-local.ceph
+- cluster.virtual-mcp-ocata-ovs-ceph-local.openstack
+- cluster.virtual-mcp-ocata-ovs-ceph-local.stacklight
+
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-dvr-ceph-rgw.local
-    cluster_name: virtual-mcp-ocata-dvr-ceph-rgw
-    # infra service addresses
+    local_repos: true
+    local_repo_url: mirror.mcp.mirantis.local.test
+    aptly_server_address: 10.170.0.242
+    linux_repo_refresh_db: true
+    cluster_domain: virtual-mcp-ocata-ovs-ceph-local.local
+    cluster_name: virtual-mcp-ocata-ovs-ceph-local
     infra_config_hostname: cfg01
+    # infra service addresses
     infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_database_address: 172.16.10.254
     openstack_proxy_address: 172.16.10.121
     openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
     openstack_control_node01_address: 172.16.10.101
     openstack_control_node02_address: 172.16.10.102
     openstack_control_node03_address: 172.16.10.103
+    openstack_gateway_address: 172.16.10.110
     openstack_database_address: ${_param:openstack_control_address}
-    openstack_database_node01_address: ${_param:openstack_control_node01_address}
-    openstack_database_node02_address: ${_param:openstack_control_node02_address}
-    openstack_database_node03_address: ${_param:openstack_control_node03_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-    openstack_gateway_address: 172.16.10.110
-    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
-    openstack_dns_node01_address: 172.16.10.111
-    openstack_dns_node02_address: 172.16.10.112
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     # ceph addresses
     ceph_osd_node01_address: 172.16.10.94
     ceph_osd_node02_address: 172.16.10.95
     ceph_mon_node01_address: 172.16.10.96
     ceph_mon_node02_address: 172.16.10.97
     ceph_mon_node03_address: 172.16.10.98
-    ceph_rgw_address: 10.60.0.75
-    ceph_rgw_node01_address: 10.60.0.76
-    ceph_rgw_node02_address: 10.60.0.77
-    ceph_rgw_node03_address: 10.60.0.78
+
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/compute.yml
new file mode 100644
index 0000000..84b7f63
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/compute.yml
@@ -0,0 +1,69 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
+- system.prometheus.exporters.libvirt
+- system.nova.compute.storage.ceph
+- system.ceph.common.cluster
+- cluster.virtual-mcp-ocata-ovs-ceph-local.ceph.common
+- cluster.virtual-mcp-ocata-ovs-ceph-local
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 1500
+    linux_system_codename: xenial
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+        notify_on:
+          state_change: vm_and_task_state
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/control.yml
similarity index 85%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/control.yml
index 3686c44..20ba0dc 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/control.yml
@@ -1,9 +1,7 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
@@ -18,7 +16,6 @@
 - system.glance.control.cluster
 - system.nova.control.cluster
 - system.neutron.control.openvswitch.cluster
-- system.cinder.control.cluster
 - system.heat.server.cluster
 - system.ceilometer.server.cluster
 - system.ceilometer.server.backend.influxdb
@@ -36,14 +33,13 @@
 - system.haproxy.proxy.listen.openstack.nova-placement
 - system.glance.control.storage.ceph
 - system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-ocata-ovs-ceph-local.ceph.common
 - system.cinder.control.backend.ceph
 - system.cinder.control.cluster
 - system.cinder.control.notification.messagingv2
 - system.cinder.volume.single
 - system.cinder.volume.notification.messagingv2
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr
+- cluster.virtual-mcp-ocata-ovs-ceph-local.infra
 parameters:
   _param:
     keepalived_vip_interface: ens4
@@ -94,10 +90,6 @@
       cpu_allocation: 54
       metadata:
         password: ${_param:metadata_password}
-      bind:
-        private_address: ${_param:cluster_local_address}
-        public_address: ${_param:cluster_vip_address}
-        novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
       notification:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/dashboard.yml
new file mode 100644
index 0000000..7335af7
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/dashboard.yml
@@ -0,0 +1,16 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.horizon.server.single
+- cluster.virtual-mcp-ocata-ovs-ceph-local
+parameters:
+  _param:
+    horizon_site_branding: OpenStack Dashboard
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/gateway.yml
new file mode 100644
index 0000000..9fd0fd8
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/gateway.yml
@@ -0,0 +1,76 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-ocata-ovs-ceph-local
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          mtu: ${_param:interface_mtu}
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_interface}
+          use_ovs_ports:
+          - float-to-ex
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/init.yml
new file mode 100644
index 0000000..6320eed
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/init.yml
@@ -0,0 +1,151 @@
+parameters:
+  _param:
+    openstack_version: ocata
+    apt_mk_version: nightly
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    neutron_control_dvr: False
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: False
+    neutron_gateway_agent_mode: legacy
+    neutron_compute_dvr: False
+    neutron_compute_agent_mode: legacy
+    neutron_compute_external_access: False
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: ${_param:cluster_vip_address}
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    metadata_password: workshop
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+    mysql_cinder_password: workshop
+    mysql_ceilometer_password: workshop
+    mysql_glance_password: workshop
+    mysql_grafana_password: workshop
+    mysql_heat_password: workshop
+    mysql_keystone_password: workshop
+    mysql_neutron_password: workshop
+    mysql_nova_password: workshop
+    mysql_aodh_password: workshop
+    keystone_service_token: workshop
+    keystone_admin_password: workshop
+    keystone_ceilometer_password: workshop
+    keystone_aodh_password: workshop
+    keystone_cinder_password: workshop
+    keystone_glance_password: workshop
+    keystone_heat_password: workshop
+    keystone_keystone_password: workshop
+    keystone_neutron_password: workshop
+    keystone_nova_password: workshop
+    ceilometer_secret_key: workshop
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 2
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
+    # Ceph
+    cinder_storage_secret_uuid: "6e84ffc6-512f-4c0f-b2b7-df67cce14bb6"
+    nova_storage_secret_uuid: "6e84ffc6-512f-4c0f-b2b7-df67cce14bb6"
+    nova_storage_pool: vms
+    nova_storage_user: nova
+    cinder_storage_pool: volumes
+    cinder_storage_user: cinder
+    glance_storage_pool: images
+    glance_storage_user: glance
+  linux:
+    network:
+      purge_hosts: true
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml
similarity index 82%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml
index a37f4fb..64a1e0e 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml
@@ -3,9 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.ceph_radosgw
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-ovs-ceph-local
 parameters:
   _param:
     nginx_proxy_ssl:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/client.yml
similarity index 94%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/client.yml
index ac069dd..483dc00 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/client.yml
@@ -4,7 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-ovs-ceph-local
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/init.yml
new file mode 100644
index 0000000..883bad0
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/init.yml
@@ -0,0 +1,35 @@
+parameters:
+  _param:
+    linux_system_codename: xenial
+    prometheus_control_address: ${_param:stacklight_monitor_address}
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_port: 9200
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/proxy.yml
similarity index 92%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/proxy.yml
index 14634e8..e646efb 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/proxy.yml
@@ -5,7 +5,7 @@
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-ovs-ceph-local
 parameters:
   _param:
     nginx_proxy_grafana_port: 15013
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml
similarity index 66%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
copy to classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml
index d47b429..680d695 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml
@@ -1,9 +1,9 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
-- system.linux.system.repo.mcp.apt_mirantis.docker
+- system.linux.system.repo_local.mcp.apt_mirantis.influxdb
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana
+- system.linux.system.repo_local.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
@@ -27,7 +27,7 @@
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-ocata-ovs-ceph-local
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
@@ -45,14 +45,14 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-    docker_image_alertmanager: docker-prod-local.artifactory.mirantis.com/openstack-docker/alertmanager:${_param:apt_mk_version}
-    docker_image_pushgateway: docker-prod-local.artifactory.mirantis.com/openstack-docker/pushgateway:${_param:apt_mk_version}
-    docker_image_prometheus: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus:${_param:apt_mk_version}
-    docker_image_remote_agent: docker-prod-local.artifactory.mirantis.com/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
-    docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
-    docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
-    docker_image_grafana: grafana/grafana:4.5.2
+    docker_image_alertmanager: apt:5000/alertmanager:${_param:apt_mk_version}
+    docker_image_pushgateway: apt:5000/pushgateway:${_param:apt_mk_version}
+    docker_image_prometheus: apt:5000/prometheus:${_param:apt_mk_version}
+    docker_image_remote_agent: apt:5000/telegraf:${_param:apt_mk_version}
+    docker_image_remote_storage_adapter: apt:5000/remote_storage_adapter:${_param:apt_mk_version}
+    docker_image_remote_collector: apt:5000/heka:${_param:apt_mk_version}
+    docker_image_prometheus_relay: apt:5000/prometheus_relay:${_param:apt_mk_version}
+    docker_image_grafana: apt:5000/grafana:${_param:apt_mk_version}
     influxdb_port: 8086
     influxdb_admin_password: password
     influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/cephfs.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/cephfs.yml
similarity index 60%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/cephfs.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/cephfs.yml
index e4fe9bb..f7f68b5 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/cephfs.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/cephfs.yml
@@ -1,3 +1,3 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
\ No newline at end of file
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml
similarity index 94%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml
index 7da40e1..318a318 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   ceph:
     common:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/init.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/init.yml
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/mon.yml
similarity index 77%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/mon.yml
index 2f46c26..e2e794b 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/mon.yml
@@ -2,8 +2,8 @@
 - system.ceph.mon.cluster
 - system.ceph.mgr.cluster
 - system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   linux:
     network:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/osd.yml
similarity index 86%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/osd.yml
index eac413b..f92849f 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/osd.yml
@@ -1,8 +1,8 @@
 classes:
 - service.ceph.osd.cluster
 - system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   linux:
     network:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/rgw.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgw.yml
similarity index 93%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/rgw.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgw.yml
index 33a8251..dee8d36 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/rgw.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgw.yml
@@ -1,8 +1,8 @@
 classes:
 - system.ceph.rgw.cluster
 - system.ceph.rgw.keystone
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   linux:
     network:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/setup.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/setup.yml
similarity index 97%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/setup.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/setup.yml
index ad3fd39..aa213b3 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/setup.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/setup.yml
@@ -1,6 +1,6 @@
 classes:
 - system.ceph.mon.cluster_init
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   ceph:
     setup:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
similarity index 97%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
index a7c9444..fbacd1d 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
@@ -27,9 +27,9 @@
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.openstack.proxy
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.stacklight.proxy
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
@@ -226,7 +226,7 @@
             external_address: 10.16.0.110
         openstack_proxy_node01:
           classes:
-          - cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
+          - cluster.virtual-mcp-pike-dvr-ceph-rgw.openstack.proxy
           params:
             linux_system_codename: xenial
         infra_storage_rack01:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/init.yml
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
similarity index 89%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
index 83d78df..c99924a 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
@@ -11,14 +11,14 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.infra
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.openstack
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.stacklight
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-dvr-ceph-rgw.local
-    cluster_name: virtual-mcp-ocata-dvr-ceph-rgw
+    cluster_domain: virtual-mcp-pike-dvr-ceph-rgw.local
+    cluster_name: virtual-mcp-pike-dvr-ceph-rgw
     # infra service addresses
     infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/compute.yml
similarity index 89%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/compute.yml
index 56d32f7..e1353f5 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/compute.yml
@@ -10,9 +10,9 @@
 - system.prometheus.exporters.libvirt
 - system.nova.compute.storage.ceph
 - system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.infra
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph.common
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
similarity index 95%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
index 3686c44..cc9f9f8 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
@@ -36,14 +36,14 @@
 - system.haproxy.proxy.listen.openstack.nova-placement
 - system.glance.control.storage.ceph
 - system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.ceph.common
 - system.cinder.control.backend.ceph
 - system.cinder.control.cluster
 - system.cinder.control.notification.messagingv2
 - system.cinder.volume.single
 - system.cinder.volume.notification.messagingv2
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.infra
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
     keepalived_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/dashboard.yml
similarity index 92%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
copy to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/dashboard.yml
index f7c7052..210a447 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/dashboard.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.horizon.server.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/gateway.yml
similarity index 93%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/gateway.yml
index eaa543f..b2290c6 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/gateway.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/init.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
similarity index 91%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
index a37f4fb..088af83 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
@@ -5,7 +5,7 @@
 - system.nginx.server.proxy.openstack_web
 - system.nginx.server.proxy.ceph_radosgw
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
     nginx_proxy_ssl:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/client.yml
similarity index 94%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/client.yml
index ac069dd..f0506f4 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/client.yml
@@ -4,7 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/init.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/init.yml
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/proxy.yml
similarity index 92%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/proxy.yml
index 14634e8..b23c6f3 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/proxy.yml
@@ -5,7 +5,7 @@
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
     nginx_proxy_grafana_port: 15013
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
similarity index 98%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
rename to classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
index d47b429..e11bc04 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
@@ -27,7 +27,7 @@
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
similarity index 71%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
copy to classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index a7c9444..348f713 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -2,14 +2,11 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
 - system.reclass.storage.salt
-- system.reclass.storage.system.ceph_mon_cluster
-- system.reclass.storage.system.ceph_rgw_cluster
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
@@ -20,16 +17,17 @@
 - system.keystone.client.service.nova-placement
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.keystone.client.service.radosgw-swift
+- system.keystone.client.service.designate
 - system.mysql.client.single
+- system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr.openstack.proxy
+- cluster.virtual-mcp-pike-dvr.stacklight.proxy
+- cluster.virtual-mcp-pike-dvr
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
@@ -138,46 +136,6 @@
           cluster_param:
             stacklight_monitor_node03_address:
               value_template: <<node_control_ip>>
-        ceph_osd_node01:
-          expression: <<node_hostname>>__equals__osd01
-          cluster_param:
-            ceph_osd_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_osd_node02:
-          expression: <<node_hostname>>__equals__osd02
-          cluster_param:
-            ceph_osd_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node01:
-          expression: <<node_hostname>>__equals__cmn01
-          cluster_param:
-            ceph_mon_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node02:
-          expression: <<node_hostname>>__equals__cmn02
-          cluster_param:
-            ceph_mon_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_mon_node03_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node01:
-          expression: <<node_hostname>>__equals__rgw01
-          cluster_param:
-            ceph_rgw_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node02:
-          expression: <<node_hostname>>__equals__rgw02
-          cluster_param:
-            ceph_rgw_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_rgw_node03_address:
-              value_template: <<node_control_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -226,27 +184,6 @@
             external_address: 10.16.0.110
         openstack_proxy_node01:
           classes:
-          - cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
+          - cluster.virtual-mcp-pike-dvr.openstack.proxy
           params:
             linux_system_codename: xenial
-        infra_storage_rack01:
-          name: osd0<<count>>
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.ceph.osd
-          repeat:
-            count: 2
-            start: 1
-            digits: 1
-            params:
-              ceph_crush_parent:
-                value: rack<<count>>
-                start: 1
-              single_address:
-                value: ceph_osd_node<<count>>_address
-                start: 1
-                digits: 2
-                interpolate: true
-          params:
-            salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/init.yml
similarity index 100%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml
copy to classes/cluster/virtual-mcp-pike-dvr/infra/init.yml
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-pike-dvr/init.yml
similarity index 76%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
copy to classes/cluster/virtual-mcp-pike-dvr/init.yml
index 83d78df..adc2b2e 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/init.yml
@@ -11,14 +11,14 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight
+- cluster.virtual-mcp-pike-dvr.infra
+- cluster.virtual-mcp-pike-dvr.openstack
+- cluster.virtual-mcp-pike-dvr.stacklight
+- cluster.overrides
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-dvr-ceph-rgw.local
-    cluster_name: virtual-mcp-ocata-dvr-ceph-rgw
+    cluster_domain: virtual-mcp-pike-dvr.local
+    cluster_name: virtual-mcp-pike-dvr
     # infra service addresses
     infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
@@ -50,13 +50,3 @@
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
-    # ceph addresses
-    ceph_osd_node01_address: 172.16.10.94
-    ceph_osd_node02_address: 172.16.10.95
-    ceph_mon_node01_address: 172.16.10.96
-    ceph_mon_node02_address: 172.16.10.97
-    ceph_mon_node03_address: 172.16.10.98
-    ceph_rgw_address: 10.60.0.75
-    ceph_rgw_node01_address: 10.60.0.76
-    ceph_rgw_node02_address: 10.60.0.77
-    ceph_rgw_node03_address: 10.60.0.78
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
similarity index 84%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml
copy to classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index 56d32f7..a435fd9 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -8,11 +8,7 @@
 - system.ceilometer.agent.cluster
 - system.linux.network.interface.single_ovs_dvr
 - system.prometheus.exporters.libvirt
-- system.nova.compute.storage.ceph
-- system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-pike-dvr
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
similarity index 71%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
copy to classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index 3686c44..81c209a 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -24,6 +24,7 @@
 - system.ceilometer.server.backend.influxdb
 - system.aodh.server.cluster
 - system.heka.ceilometer_collector.single
+- system.designate.server.cluster
 - system.galera.server.cluster
 - system.galera.server.database.aodh
 - system.galera.server.database.ceilometer
@@ -33,17 +34,10 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
-- system.glance.control.storage.ceph
-- system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- system.cinder.control.backend.ceph
-- system.cinder.control.cluster
-- system.cinder.control.notification.messagingv2
-- system.cinder.volume.single
-- system.cinder.volume.notification.messagingv2
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr
+- cluster.virtual-mcp-pike-dvr
+
 parameters:
   _param:
     keepalived_vip_interface: ens4
@@ -71,8 +65,39 @@
       notification:
         driver: messagingv2
         topics: "notifications,${_param:stacklight_notification_topic}"
+  designate:
+    pool_manager:
+      enabled: ${_param:designate_pool_manager_enabled}
+      periodic_sync_interval: ${_param:designate_pool_manager_periodic_sync_interval}
+    server:
+      backend:
+        pdns4:
+          api_token: ${_param:designate_pdns_api_key}
+          api_endpoint: ${_param:designate_pdns_api_endpoint}
+      mdns:
+        address: ${_param:designate_mdns_address}
+        port: ${_param:designate_mdns_port}
+      pools:
+        default:
+          description: 'test pool'
+          targets:
+            default:
+              description: 'test target1'
+            default1:
+              type: ${_param:designate_pool_target_type}
+              description: 'test target2'
+              masters: ${_param:designate_pool_target_masters}
+              options:
+                host: ${_param:openstack_dns_node02_address}
+                port: 53
+                api_endpoint: "http://${_param:openstack_dns_node02_address}:${_param:powerdns_webserver_port}"
+                api_token: ${_param:designate_pdns_api_key}
+      quota:
+        zones: ${_param:designate_quota_zones}
   glance:
     server:
+      storage:
+        engine: file
       images: []
       workers: 1
       notification:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/dashboard.yml
similarity index 92%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
copy to classes/cluster/virtual-mcp-pike-dvr/openstack/dashboard.yml
index f7c7052..a2b03a4 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/dashboard.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.horizon.server.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/dns.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/dns.yml
new file mode 100644
index 0000000..bff14d2
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/dns.yml
@@ -0,0 +1,35 @@
+classes:
+- system.powerdns.server.single
+- cluster.virtual-mcp-pike-dvr
+
+parameters:
+  powerdns:
+    server:
+      api:
+          enabled: True
+          key: ${_param:designate_pdns_api_key}
+      axfr_ips:
+          ${_param:powerdns_axfr_ips}
+      bind:
+          address: ${_param:single_address}
+      overwrite_supermasters: True
+      supermasters:
+          ${_param:powerdns_supermasters}
+      webserver:
+          enabled: True
+          address: ${_param:single_address}
+          password: ${_param:powerdns_webserver_password}
+          port: ${_param:powerdns_webserver_port}
+  linux:
+    system:
+      package:
+        python-msgpack:
+          version: latest
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
similarity index 93%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml
copy to classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
index eaa543f..e5aac4e 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
new file mode 100644
index 0000000..731ec40
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -0,0 +1,210 @@
+parameters:
+  _param:
+    openstack_version: pike
+    apt_mk_version: nightly
+    cinder_version: ${_param:openstack_version}
+    mcp_repo_version: 1.1
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    cluster_public_protocol: http
+    neutron_control_dvr: True
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: True
+    neutron_gateway_agent_mode: dvr_snat
+    neutron_compute_dvr: True
+    neutron_compute_agent_mode: dvr
+    neutron_compute_external_access: True
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    powerdns_axfr_ips:
+      - ${_param:openstack_control_node01_address}
+      - ${_param:openstack_control_node02_address}
+      - ${_param:openstack_control_node03_address}
+      - 127.0.0.1
+    powerdns_supermasters:
+      - ip: ${_param:openstack_control_node01_address}
+        nameserver: ns1.example.org
+        account: master
+      - ip: ${_param:openstack_control_node02_address}
+        nameserver: ns2.example.org
+        account: master
+      - ip: ${_param:openstack_control_node03_address}
+        nameserver: ns3.example.org
+        account: master
+    powerdns_overwrite_supermasters: True
+    powerdns_webserver_password: gJ6n3gVaYP8eS
+    powerdns_webserver_port: 8081
+    designate_admin_api_enabled: true
+    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+    designate_mdns_address: 0.0.0.0
+    designate_mdns_port: 53
+    designate_pdns_api_key: VxK9cMlFL5Ae
+    designate_pdns_api_endpoint: "http://${_param:openstack_dns_node01_address}:${_param:powerdns_webserver_port}"
+    designate_pool_manager_enabled: True
+    designate_pool_manager_periodic_sync_interval: '120'
+    designate_pool_ns_records:
+      - hostname: 'ns1.example.org.'
+        priority: 10
+      - hostname: 'ns2.example.org.'
+        priority: 20
+      - hostname: 'ns3.example.org.'
+        priority: 30
+    designate_pool_nameservers:
+      - host: ${_param:openstack_dns_node01_address}
+        port: 53
+      - host: ${_param:openstack_dns_node02_address}
+        port: 53
+    designate_pool_target_type: pdns4
+    designate_pool_target_masters:
+      - host: ${_param:openstack_control_node01_address}
+        port: 53
+      - host: ${_param:openstack_control_node02_address}
+        port: 53
+      - host: ${_param:openstack_control_node03_address}
+        port: 53
+    designate_pool_target_options:
+      host: ${_param:openstack_dns_node01_address}
+      port: 53
+      api_token: ${_param:designate_pdns_api_key}
+      api_endpoint: ${_param:designate_pdns_api_endpoint}
+    designate_quota_zones: 40
+    designate_version: ${_param:openstack_version}
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: ${_param:cluster_vip_address}
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    designate_service_host: ${_param:cluster_vip_address}
+    metadata_password: password
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+    mysql_cinder_password: workshop
+    mysql_ceilometer_password: workshop
+    mysql_glance_password: workshop
+    mysql_grafana_password: workshop
+    mysql_heat_password: workshop
+    mysql_keystone_password: workshop
+    mysql_neutron_password: workshop
+    mysql_nova_password: workshop
+    mysql_aodh_password: workshop
+    mysql_designate_password: workshop
+    keystone_service_token: workshop
+    keystone_admin_password: workshop
+    keystone_aodh_password: workshop
+    keystone_ceilometer_password: workshop
+    keystone_cinder_password: workshop
+    keystone_glance_password: workshop
+    keystone_heat_password: workshop
+    keystone_keystone_password: workshop
+    keystone_neutron_password: workshop
+    keystone_nova_password: workshop
+    keystone_designate_password: workshop
+    ceilometer_secret_key: workshop
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 2
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
+  linux:
+    network:
+      purge_hosts: true
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
+        dns01:
+          address: ${_param:openstack_dns_node01_address}
+          names:
+          - dns01
+          - dns01.${_param:cluster_domain}
+        dns02:
+          address: ${_param:openstack_dns_node02_address}
+          names:
+          - dns02
+          - dns02.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
similarity index 82%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
copy to classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
index a37f4fb..3420f43 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
@@ -3,9 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.ceph_radosgw
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr
 parameters:
   _param:
     nginx_proxy_ssl:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml
similarity index 94%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
copy to classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml
index ac069dd..6c7badd 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml
@@ -4,7 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/init.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/init.yml
similarity index 100%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/init.yml
copy to classes/cluster/virtual-mcp-pike-dvr/stacklight/init.yml
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/proxy.yml
similarity index 92%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
copy to classes/cluster/virtual-mcp-pike-dvr/stacklight/proxy.yml
index 14634e8..1bc78f3 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/stacklight/proxy.yml
@@ -5,7 +5,7 @@
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr
 parameters:
   _param:
     nginx_proxy_grafana_port: 15013
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml
similarity index 73%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
copy to classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml
index d47b429..9ea9b92 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml
@@ -1,9 +1,11 @@
 classes:
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.elastic
 - system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.mcp.apt_mirantis.docker
+- system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
@@ -27,7 +29,7 @@
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-dvr
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
@@ -45,13 +47,13 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-    docker_image_alertmanager: docker-prod-local.artifactory.mirantis.com/openstack-docker/alertmanager:${_param:apt_mk_version}
-    docker_image_pushgateway: docker-prod-local.artifactory.mirantis.com/openstack-docker/pushgateway:${_param:apt_mk_version}
-    docker_image_prometheus: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus:${_param:apt_mk_version}
-    docker_image_remote_agent: docker-prod-local.artifactory.mirantis.com/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
-    docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
-    docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
+    docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
+    docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
+    docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+    docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
+    docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
     docker_image_grafana: grafana/grafana:4.5.2
     influxdb_port: 8086
     influxdb_admin_password: password
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/cephfs.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/cephfs.yml
similarity index 60%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/cephfs.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/cephfs.yml
index e4fe9bb..e61ff1f 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/cephfs.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/cephfs.yml
@@ -1,3 +1,3 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
\ No newline at end of file
+- cluster.virtual-mcp-pike-ovs-ceph
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/common.yml
similarity index 82%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/common.yml
index 7da40e1..3b8d738 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/common.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs-ceph
 parameters:
   ceph:
     common:
@@ -16,9 +16,9 @@
           name: ${_param:cinder_storage_user}
           caps:
             mon: "allow r"
-            osd: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rwx pool=images"
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rx pool=images"
         nova:
           name: ${_param:nova_storage_user}
           caps:
             mon: "allow r"
-            osd: "allow class-read object_prefix rbd_children, allow rwx pool=vms, allow rx pool=images, allow rwx pool=volumes"
\ No newline at end of file
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=vms, allow rx pool=images"
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/init.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/init.yml
new file mode 100644
index 0000000..2f0d2ec
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/init.yml
@@ -0,0 +1,48 @@
+parameters:
+  _param:
+    linux_repo_ceph_component: ${_param:ceph_version}
+    ceph_version: luminous
+    ceph_mon_node01_hostname: cmn01
+    ceph_mon_node02_hostname: cmn02
+    ceph_mon_node03_hostname: cmn03
+
+    ceph_osd_node01_hostname: osd01
+    ceph_osd_node02_hostname: osd02
+
+
+    ceph_osd_node01_address: 172.16.10.94
+    ceph_osd_node02_address: 172.16.10.95
+    ceph_mon_node01_address: 172.16.10.96
+    ceph_mon_node02_address: 172.16.10.97
+    ceph_mon_node03_address: 172.16.10.98
+
+    ceph_cluster_fsid: a619c5fc-c4ed-4f22-9ed2-66cf2feca23d
+
+  linux:
+    network:
+      host:
+        cmn01:
+          address: ${_param:ceph_mon_node01_address}
+          names:
+          - ${_param:ceph_mon_node01_hostname}
+          - ${_param:ceph_mon_node01_hostname}.${_param:cluster_domain}
+        cmn02:
+          address: ${_param:ceph_mon_node02_address}
+          names:
+          - ${_param:ceph_mon_node02_hostname}
+          - ${_param:ceph_mon_node02_hostname}.${_param:cluster_domain}
+        cmn03:
+          address: ${_param:ceph_mon_node03_address}
+          names:
+          - ${_param:ceph_mon_node03_hostname}
+          - ${_param:ceph_mon_node03_hostname}.${_param:cluster_domain}
+        osd01:
+          address: ${_param:ceph_osd_node01_address}
+          names:
+          - ${_param:ceph_osd_node01_hostname}
+          - ${_param:ceph_osd_node01_hostname}.${_param:cluster_domain}
+        osd02:
+          address: ${_param:ceph_osd_node02_address}
+          names:
+          - ${_param:ceph_osd_node02_hostname}
+          - ${_param:ceph_osd_node02_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/mon.yml
similarity index 77%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/mon.yml
index 2f46c26..803aac5 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/mon.yml
@@ -2,8 +2,7 @@
 - system.ceph.mon.cluster
 - system.ceph.mgr.cluster
 - system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs-ceph
 parameters:
   linux:
     network:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/osd.yml
similarity index 67%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/osd.yml
index eac413b..20e7089 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/osd.yml
@@ -1,8 +1,7 @@
 classes:
 - service.ceph.osd.cluster
 - system.linux.system.repo.mcp.apt_mirantis.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs-ceph
 parameters:
   linux:
     network:
@@ -18,12 +17,9 @@
     osd:
       enabled: true
       crush_parent: ${_param:ceph_crush_parent}
-      bluestore_block_db_size: 900000000
-      bluestore_block_wal_size: 900000000
+      bluestore_block_db_size: 10073741824
       backend:
         bluestore:
           disks:
             - dev: /dev/vdb
               block_db: /dev/vdb
-            - dev: /dev/vdc
-              block_db: /dev/vdc
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/setup.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/setup.yml
new file mode 100644
index 0000000..2f6ca80
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/setup.yml
@@ -0,0 +1,28 @@
+classes:
+- system.ceph.mon.cluster_init
+- cluster.virtual-mcp-pike-ovs-ceph
+parameters:
+  ceph:
+    setup:
+      pool:
+        images:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          size: 2
+          application: rbd
+          crush_rule: sata
+        volumes:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          size: 2
+          application: rbd
+          crush_rule: sata
+        vms:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          size: 2
+          application: rbd
+          crush_rule: sata
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
similarity index 89%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
index a7c9444..5500883 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
@@ -9,7 +9,6 @@
 - system.salt.master.pkg
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
-- system.reclass.storage.system.ceph_rgw_cluster
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
@@ -20,28 +19,27 @@
 - system.keystone.client.service.nova-placement
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.keystone.client.service.radosgw-swift
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs-ceph.openstack.proxy
+- cluster.virtual-mcp-pike-ovs-ceph.stacklight.proxy
+- cluster.virtual-mcp-pike-ovs-ceph
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
     reclass_data_revision: master
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     reclass_config_master: 192.168.10.90
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
       interface:
@@ -56,7 +54,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: ${_param:openstack_proxy_address}
+            host: prx
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:
@@ -163,21 +161,6 @@
           cluster_param:
             ceph_mon_node03_address:
               value_template: <<node_control_ip>>
-        ceph_rgw_node01:
-          expression: <<node_hostname>>__equals__rgw01
-          cluster_param:
-            ceph_rgw_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node02:
-          expression: <<node_hostname>>__equals__rgw02
-          cluster_param:
-            ceph_rgw_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_rgw_node03_address:
-              value_template: <<node_control_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -226,7 +209,7 @@
             external_address: 10.16.0.110
         openstack_proxy_node01:
           classes:
-          - cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
+          - cluster.virtual-mcp-pike-ovs-ceph.openstack.proxy
           params:
             linux_system_codename: xenial
         infra_storage_rack01:
@@ -249,4 +232,4 @@
                 interpolate: true
           params:
             salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
+            linux_system_codename: xenial
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/init.yml
similarity index 100%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/infra/init.yml
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
similarity index 71%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
index 83d78df..965e6c2 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
@@ -11,52 +11,45 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight
+- cluster.virtual-mcp-pike-ovs-ceph.infra
+- cluster.virtual-mcp-pike-ovs-ceph.ceph
+- cluster.virtual-mcp-pike-ovs-ceph.openstack
+- cluster.virtual-mcp-pike-ovs-ceph.stacklight
+
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-dvr-ceph-rgw.local
-    cluster_name: virtual-mcp-ocata-dvr-ceph-rgw
-    # infra service addresses
+    cluster_domain: virtual-mcp-pike-ovs-ceph.local
+    cluster_name: virtual-mcp-pike-ovs-ceph
     infra_config_hostname: cfg01
+    # infra service addresses
     infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_database_address: 172.16.10.254
     openstack_proxy_address: 172.16.10.121
     openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
     openstack_control_node01_address: 172.16.10.101
     openstack_control_node02_address: 172.16.10.102
     openstack_control_node03_address: 172.16.10.103
+    openstack_gateway_address: 172.16.10.110
     openstack_database_address: ${_param:openstack_control_address}
-    openstack_database_node01_address: ${_param:openstack_control_node01_address}
-    openstack_database_node02_address: ${_param:openstack_control_node02_address}
-    openstack_database_node03_address: ${_param:openstack_control_node03_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-    openstack_gateway_address: 172.16.10.110
-    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
-    openstack_dns_node01_address: 172.16.10.111
-    openstack_dns_node02_address: 172.16.10.112
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     # ceph addresses
     ceph_osd_node01_address: 172.16.10.94
     ceph_osd_node02_address: 172.16.10.95
     ceph_mon_node01_address: 172.16.10.96
     ceph_mon_node02_address: 172.16.10.97
     ceph_mon_node03_address: 172.16.10.98
-    ceph_rgw_address: 10.60.0.75
-    ceph_rgw_node01_address: 10.60.0.76
-    ceph_rgw_node02_address: 10.60.0.77
-    ceph_rgw_node03_address: 10.60.0.78
+
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/compute.yml
new file mode 100644
index 0000000..12e9166
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/compute.yml
@@ -0,0 +1,71 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
+- system.prometheus.exporters.libvirt
+- system.nova.compute.storage.ceph
+- system.ceph.common.cluster
+- cluster.virtual-mcp-pike-ovs-ceph.ceph.common
+- cluster.virtual-mcp-pike-ovs-ceph.infra
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 1500
+    linux_system_codename: xenial
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+        notify_on:
+          state_change: vm_and_task_state
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
similarity index 90%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
index 3686c44..d0a95c8 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
@@ -18,7 +18,6 @@
 - system.glance.control.cluster
 - system.nova.control.cluster
 - system.neutron.control.openvswitch.cluster
-- system.cinder.control.cluster
 - system.heat.server.cluster
 - system.ceilometer.server.cluster
 - system.ceilometer.server.backend.influxdb
@@ -36,14 +35,13 @@
 - system.haproxy.proxy.listen.openstack.nova-placement
 - system.glance.control.storage.ceph
 - system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
+- cluster.virtual-mcp-pike-ovs-ceph.ceph.common
 - system.cinder.control.backend.ceph
 - system.cinder.control.cluster
 - system.cinder.control.notification.messagingv2
 - system.cinder.volume.single
 - system.cinder.volume.notification.messagingv2
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr
+- cluster.virtual-mcp-pike-ovs-ceph.infra
 parameters:
   _param:
     keepalived_vip_interface: ens4
@@ -94,10 +92,6 @@
       cpu_allocation: 54
       metadata:
         password: ${_param:metadata_password}
-      bind:
-        private_address: ${_param:cluster_local_address}
-        public_address: ${_param:cluster_vip_address}
-        novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
       notification:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml
similarity index 92%
rename from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
rename to classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml
index f7c7052..50e37af 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.horizon.server.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs-ceph
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml
new file mode 100644
index 0000000..2c6b151
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml
@@ -0,0 +1,81 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-pike-ovs-ceph
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          mtu: ${_param:interface_mtu}
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_interface}
+          use_ovs_ports:
+          - float-to-ex
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/init.yml
new file mode 100644
index 0000000..2c253cc
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/init.yml
@@ -0,0 +1,152 @@
+parameters:
+  _param:
+    openstack_version: pike
+    cinder_version: ${_param:openstack_version}
+    apt_mk_version: testing
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    neutron_control_dvr: False
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: False
+    neutron_gateway_agent_mode: legacy
+    neutron_compute_dvr: False
+    neutron_compute_agent_mode: legacy
+    neutron_compute_external_access: False
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: ${_param:cluster_vip_address}
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    metadata_password: workshop
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+    mysql_cinder_password: workshop
+    mysql_ceilometer_password: workshop
+    mysql_glance_password: workshop
+    mysql_grafana_password: workshop
+    mysql_heat_password: workshop
+    mysql_keystone_password: workshop
+    mysql_neutron_password: workshop
+    mysql_nova_password: workshop
+    mysql_aodh_password: workshop
+    keystone_service_token: workshop
+    keystone_admin_password: workshop
+    keystone_ceilometer_password: workshop
+    keystone_aodh_password: workshop
+    keystone_cinder_password: workshop
+    keystone_glance_password: workshop
+    keystone_heat_password: workshop
+    keystone_keystone_password: workshop
+    keystone_neutron_password: workshop
+    keystone_nova_password: workshop
+    ceilometer_secret_key: workshop
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 2
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
+    # Ceph
+    cinder_storage_secret_uuid: "7e84ffc6-512f-4c0f-b2b7-df67cce14bb7"
+    nova_storage_secret_uuid: "6e84ffc6-512f-4c0f-b2b7-df67cce14bb6"
+    nova_storage_pool: vms
+    nova_storage_user: nova
+    cinder_storage_pool: volumes
+    cinder_storage_user: cinder
+    glance_storage_pool: images
+    glance_storage_user: glance
+  linux:
+    network:
+      purge_hosts: true
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
similarity index 82%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
index a37f4fb..00eb616 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
@@ -3,9 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.ceph_radosgw
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs-ceph
 parameters:
   _param:
     nginx_proxy_ssl:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/client.yml
similarity index 94%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/client.yml
index ac069dd..8a5b42e 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/client.yml
@@ -4,7 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs-ceph
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/init.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/init.yml
new file mode 100644
index 0000000..883bad0
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/init.yml
@@ -0,0 +1,35 @@
+parameters:
+  _param:
+    linux_system_codename: xenial
+    prometheus_control_address: ${_param:stacklight_monitor_address}
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_port: 9200
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/proxy.yml
similarity index 92%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/proxy.yml
index 14634e8..672b58b 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/proxy.yml
@@ -5,7 +5,7 @@
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs-ceph
 parameters:
   _param:
     nginx_proxy_grafana_port: 15013
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
similarity index 95%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
copy to classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
index d47b429..638305d 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
@@ -27,7 +27,7 @@
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs-ceph
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
@@ -52,7 +52,7 @@
     docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
-    docker_image_grafana: grafana/grafana:4.5.2
+    docker_image_grafana: docker-prod-local.artifactory.mirantis.com/mirantis/external/grafana:${_param:apt_mk_version}
     influxdb_port: 8086
     influxdb_admin_password: password
     influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
similarity index 70%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
copy to classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index a7c9444..cce68af 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -2,14 +2,11 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
 - system.reclass.storage.salt
-- system.reclass.storage.system.ceph_mon_cluster
-- system.reclass.storage.system.ceph_rgw_cluster
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
@@ -20,28 +17,28 @@
 - system.keystone.client.service.nova-placement
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.keystone.client.service.radosgw-swift
+- system.keystone.client.service.designate
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs.openstack.proxy
+- cluster.virtual-mcp-pike-ovs.stacklight.proxy
+- cluster.virtual-mcp-pike-ovs
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
     reclass_data_revision: master
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     reclass_config_master: 192.168.10.90
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
       interface:
@@ -56,7 +53,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: ${_param:openstack_proxy_address}
+            host: prx
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:
@@ -138,46 +135,6 @@
           cluster_param:
             stacklight_monitor_node03_address:
               value_template: <<node_control_ip>>
-        ceph_osd_node01:
-          expression: <<node_hostname>>__equals__osd01
-          cluster_param:
-            ceph_osd_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_osd_node02:
-          expression: <<node_hostname>>__equals__osd02
-          cluster_param:
-            ceph_osd_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node01:
-          expression: <<node_hostname>>__equals__cmn01
-          cluster_param:
-            ceph_mon_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node02:
-          expression: <<node_hostname>>__equals__cmn02
-          cluster_param:
-            ceph_mon_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_mon_node03_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node01:
-          expression: <<node_hostname>>__equals__rgw01
-          cluster_param:
-            ceph_rgw_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node02:
-          expression: <<node_hostname>>__equals__rgw02
-          cluster_param:
-            ceph_rgw_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_rgw_node03_address:
-              value_template: <<node_control_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -226,27 +183,6 @@
             external_address: 10.16.0.110
         openstack_proxy_node01:
           classes:
-          - cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
+          - cluster.virtual-mcp-pike-ovs.openstack.proxy
           params:
             linux_system_codename: xenial
-        infra_storage_rack01:
-          name: osd0<<count>>
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.ceph.osd
-          repeat:
-            count: 2
-            start: 1
-            digits: 1
-            params:
-              ceph_crush_parent:
-                value: rack<<count>>
-                start: 1
-              single_address:
-                value: ceph_osd_node<<count>>_address
-                start: 1
-                digits: 2
-                interpolate: true
-          params:
-            salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/init.yml
similarity index 100%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml
copy to classes/cluster/virtual-mcp-pike-ovs/infra/init.yml
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-pike-ovs/init.yml
similarity index 63%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
copy to classes/cluster/virtual-mcp-pike-ovs/init.yml
index 83d78df..235aac0 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/init.yml
@@ -11,52 +11,38 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight
+- cluster.virtual-mcp-pike-ovs.infra
+- cluster.virtual-mcp-pike-ovs.openstack
+- cluster.virtual-mcp-pike-ovs.stacklight
+
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-dvr-ceph-rgw.local
-    cluster_name: virtual-mcp-ocata-dvr-ceph-rgw
-    # infra service addresses
+    cluster_domain: virtual-mcp-pike-ovs.local
+    cluster_name: virtual-mcp-pike-ovs
     infra_config_hostname: cfg01
+    # infra service addresses
     infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_database_address: 172.16.10.254
     openstack_proxy_address: 172.16.10.121
     openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
     openstack_control_node01_address: 172.16.10.101
     openstack_control_node02_address: 172.16.10.102
     openstack_control_node03_address: 172.16.10.103
+    openstack_gateway_address: 172.16.10.110
     openstack_database_address: ${_param:openstack_control_address}
-    openstack_database_node01_address: ${_param:openstack_control_node01_address}
-    openstack_database_node02_address: ${_param:openstack_control_node02_address}
-    openstack_database_node03_address: ${_param:openstack_control_node03_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-    openstack_gateway_address: 172.16.10.110
-    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
-    openstack_dns_node01_address: 172.16.10.111
-    openstack_dns_node02_address: 172.16.10.112
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
-    # ceph addresses
-    ceph_osd_node01_address: 172.16.10.94
-    ceph_osd_node02_address: 172.16.10.95
-    ceph_mon_node01_address: 172.16.10.96
-    ceph_mon_node02_address: 172.16.10.97
-    ceph_mon_node03_address: 172.16.10.98
-    ceph_rgw_address: 10.60.0.75
-    ceph_rgw_node01_address: 10.60.0.76
-    ceph_rgw_node02_address: 10.60.0.77
-    ceph_rgw_node03_address: 10.60.0.78
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
new file mode 100644
index 0000000..97a0cfb
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
@@ -0,0 +1,68 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
+- system.prometheus.exporters.libvirt
+- cluster.virtual-mcp-pike-ovs
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 1500
+    linux_system_codename: xenial
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+        notify_on:
+          state_change: vm_and_task_state
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
similarity index 64%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
copy to classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 3686c44..38c3c70 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -24,6 +24,9 @@
 - system.ceilometer.server.backend.influxdb
 - system.aodh.server.cluster
 - system.heka.ceilometer_collector.single
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
 - system.galera.server.cluster
 - system.galera.server.database.aodh
 - system.galera.server.database.ceilometer
@@ -33,17 +36,9 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
-- system.glance.control.storage.ceph
-- system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- system.cinder.control.backend.ceph
-- system.cinder.control.cluster
-- system.cinder.control.notification.messagingv2
-- system.cinder.volume.single
-- system.cinder.volume.notification.messagingv2
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr
+- cluster.virtual-mcp-pike-ovs
 parameters:
   _param:
     keepalived_vip_interface: ens4
@@ -65,14 +60,62 @@
       instance:
         VIP:
           virtual_router_id: 150
+  bind:
+    server:
+      control:
+        mgmt:
+          enabled: true
+          bind:
+            address: ${_param:single_address}
+            port: 953
+          allow:
+            - ${_param:openstack_control_node01_address}
+            - ${_param:openstack_control_node02_address}
+            - ${_param:openstack_control_node03_address}
+          keys:
+            - designate
   keystone:
     server:
       admin_email: ${_param:admin_email}
       notification:
         driver: messagingv2
         topics: "notifications,${_param:stacklight_notification_topic}"
+  designate:
+    server:
+      pools:
+        default:
+          description: 'test pool'
+          targets:
+            default:
+              description: 'test target1'
+            default1:
+              type: ${_param:designate_pool_target_type}
+              description: 'test target2'
+              masters: ${_param:designate_pool_target_masters}
+              options:
+                host: ${_param:openstack_control_node02_address}
+                port: 53
+                rndc_host: ${_param:openstack_control_node02_address}
+                rndc_port: 953
+                rndc_key_file: /etc/designate/rndc.key
+            default2:
+              type: ${_param:designate_pool_target_type}
+              description: 'test target3'
+              masters: ${_param:designate_pool_target_masters}
+              options:
+                host: ${_param:openstack_control_node03_address}
+                port: 53
+                rndc_host: ${_param:openstack_control_node03_address}
+                rndc_port: 953
+                rndc_key_file: /etc/designate/rndc.key
+      quota:
+        zones: ${_param:designate_quota_zones}
+    worker:
+      enabled: ${_param:designate_worker_enabled}
   glance:
     server:
+      storage:
+        engine: file
       images: []
       workers: 1
       notification:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/dashboard.yml
similarity index 92%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
copy to classes/cluster/virtual-mcp-pike-ovs/openstack/dashboard.yml
index f7c7052..e13f6c8 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/dashboard.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.horizon.server.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
new file mode 100644
index 0000000..37ca230
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
@@ -0,0 +1,81 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-pike-ovs
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          mtu: ${_param:interface_mtu}
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_interface}
+          use_ovs_ports:
+          - float-to-ex
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
new file mode 100644
index 0000000..c13a42d
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
@@ -0,0 +1,176 @@
+parameters:
+  _param:
+    openstack_version: pike
+    cinder_version: ${_param:openstack_version}
+    apt_mk_version: testing
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    neutron_control_dvr: False
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: False
+    neutron_gateway_agent_mode: legacy
+    neutron_compute_dvr: False
+    neutron_compute_agent_mode: legacy
+    neutron_compute_external_access: False
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    designate_admin_api_enabled: true
+    designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+    designate_quota_zones: 40
+    designate_pool_ns_records:
+      - hostname: 'ns1.example.org.'
+        priority: 10
+    designate_pool_nameservers:
+      - host: ${_param:openstack_control_node01_address}
+        port: 53
+      - host: ${_param:openstack_control_node02_address}
+        port: 53
+      - host: ${_param:openstack_control_node03_address}
+        port: 53
+    designate_pool_target_type: bind9
+    designate_pool_target_masters:
+      - host: ${_param:openstack_control_node01_address}
+        port: 5354
+      - host: ${_param:openstack_control_node02_address}
+        port: 5354
+      - host: ${_param:openstack_control_node03_address}
+        port: 5354
+    designate_pool_target_options:
+      host: ${_param:openstack_control_node01_address}
+      port: 53
+      rndc_host: ${_param:openstack_control_node01_address}
+      rndc_port: 953
+      rndc_key_file: /etc/designate/rndc.key
+    designate_version: ${_param:openstack_version}
+    designate_worker_enabled: true
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: ${_param:cluster_vip_address}
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    designate_service_host: ${_param:cluster_vip_address}
+    metadata_password: workshop
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+    mysql_cinder_password: workshop
+    mysql_ceilometer_password: workshop
+    mysql_glance_password: workshop
+    mysql_grafana_password: workshop
+    mysql_heat_password: workshop
+    mysql_keystone_password: workshop
+    mysql_neutron_password: workshop
+    mysql_nova_password: workshop
+    mysql_aodh_password: workshop
+    mysql_designate_password: workshop
+    keystone_service_token: workshop
+    keystone_admin_password: workshop
+    keystone_ceilometer_password: workshop
+    keystone_aodh_password: workshop
+    keystone_cinder_password: workshop
+    keystone_glance_password: workshop
+    keystone_heat_password: workshop
+    keystone_keystone_password: workshop
+    keystone_neutron_password: workshop
+    keystone_nova_password: workshop
+    keystone_designate_password: workshop
+    ceilometer_secret_key: workshop
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 2
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
+  linux:
+    network:
+      purge_hosts: true
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
similarity index 82%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
copy to classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
index a37f4fb..f7ec9ce 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
@@ -3,9 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.ceph_radosgw
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs
 parameters:
   _param:
     nginx_proxy_ssl:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml b/classes/cluster/virtual-mcp-pike-ovs/stacklight/client.yml
similarity index 94%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
copy to classes/cluster/virtual-mcp-pike-ovs/stacklight/client.yml
index ac069dd..62634a9 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/stacklight/client.yml
@@ -4,7 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/virtual-mcp-pike-ovs/stacklight/init.yml b/classes/cluster/virtual-mcp-pike-ovs/stacklight/init.yml
new file mode 100644
index 0000000..883bad0
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/stacklight/init.yml
@@ -0,0 +1,35 @@
+parameters:
+  _param:
+    linux_system_codename: xenial
+    prometheus_control_address: ${_param:stacklight_monitor_address}
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_port: 9200
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs/stacklight/proxy.yml
similarity index 92%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
copy to classes/cluster/virtual-mcp-pike-ovs/stacklight/proxy.yml
index 14634e8..1e72fd9 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/stacklight/proxy.yml
@@ -5,7 +5,7 @@
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs
 parameters:
   _param:
     nginx_proxy_grafana_port: 15013
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml
similarity index 94%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
copy to classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml
index d47b429..d238e21 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml
@@ -1,6 +1,7 @@
 classes:
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.elastic
 - system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.mcp.apt_mirantis.docker
@@ -27,7 +28,7 @@
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-mcp-pike-ovs
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
@@ -52,7 +53,7 @@
     docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
-    docker_image_grafana: grafana/grafana:4.5.2
+    docker_image_grafana: docker-prod-local.artifactory.mirantis.com/mirantis/external/grafana:${_param:apt_mk_version}
     influxdb_port: 8086
     influxdb_admin_password: password
     influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 1694dd3..8a2b105 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -8,6 +8,7 @@
 - system.salt.master.pkg
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
 - system.reclass.storage.salt
 - system.mysql.client
 - system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml
index 52fdf6f..14b47b2 100755
--- a/classes/cluster/virtual-mcp11-contrail/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -1,9 +1,13 @@
 classes:
 - system.linux.network.dynamic_hosts
 - service.grafana.collector
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
 - system.linux.system.repo.mcp.extra
+- system.linux.system.repo.fluentd
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
index 50b13ed..c600e35 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
@@ -117,6 +117,8 @@
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
     ceilometer_influxdb_password: lmapass
+    openstack_log_appender: true
+    openstack_fluentd_handler_enabled: true
   linux:
     network:
       purge_hosts: true
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
index f30d6e4..f74b8c1 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
@@ -8,7 +8,6 @@
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
     prometheus_control_address: ${_param:stacklight_monitor_address}
-    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
@@ -16,6 +15,7 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:openstack_database_address}
     grafana_database_password: ${_param:mysql_grafana_password}
+    fluentd_elasticsearch_host: ${_param:stacklight_log_address}
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 818e360..f7fb72d 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -5,10 +5,6 @@
 - system.linux.system.repo.mcp.apt_mirantis.elastic
 - system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.docker
-- system.heka.remote_collector.container
-- system.heka.remote_collector.input.amqp
-- system.heka.remote_collector.output.elasticsearch
-- system.heka.remote_collector.output.telegraf
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
@@ -26,12 +22,10 @@
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
-- system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-contrail
 parameters:
   _param:
-    heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
@@ -51,7 +45,6 @@
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
-    docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
     docker_image_grafana: grafana/grafana:4.5.2
     influxdb_port: 8086
@@ -61,7 +54,6 @@
     prometheus_influxdb_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
-    remote_collector_telegraf_host: monitoring_remote_agent
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp11-dvr/init.yml b/classes/cluster/virtual-mcp11-dvr/init.yml
index 8e93cbf..7e287ad 100644
--- a/classes/cluster/virtual-mcp11-dvr/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/init.yml
@@ -1,9 +1,13 @@
 classes:
 - system.linux.network.dynamic_hosts
 - service.grafana.collector
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
 - system.linux.system.repo.mcp.extra
+- system.linux.system.repo.fluentd
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.prometheus.collector
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
index 0b4ed38..5729943 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
@@ -4,7 +4,6 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.horizon.server.single
-- system.horizon.server.plugin.theme
 - cluster.virtual-mcp11-dvr
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
index d19da8f..b94f060 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
@@ -116,6 +116,8 @@
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
     ceilometer_influxdb_password: lmapass
+    openstack_log_appender: true
+    openstack_fluentd_handler_enabled: true
   linux:
     network:
       purge_hosts: true
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
index 3c05ce8..19addd9 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
@@ -12,7 +12,6 @@
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
     prometheus_control_address: ${_param:stacklight_monitor_address}
-    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
@@ -20,6 +19,7 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:openstack_database_address}
     grafana_database_password: ${_param:mysql_grafana_password}
+    fluentd_elasticsearch_host: ${_param:stacklight_log_address}
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index d151d16..b469f84 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -5,10 +5,6 @@
 - system.linux.system.repo.mcp.apt_mirantis.elastic
 - system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.docker
-- system.heka.remote_collector.container
-- system.heka.remote_collector.input.amqp
-- system.heka.remote_collector.output.elasticsearch
-- system.heka.remote_collector.output.telegraf
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
@@ -26,12 +22,10 @@
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
-- system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-dvr
 parameters:
   _param:
-    heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
@@ -51,7 +45,6 @@
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
-    docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
     docker_image_grafana: grafana/grafana:4.5.2
     influxdb_port: 8086
@@ -61,7 +54,6 @@
     prometheus_influxdb_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
-    remote_collector_telegraf_host: monitoring_remote_agent
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
index b2c99c8..c1cc38f 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
@@ -23,7 +23,7 @@
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
     kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
index 05b6ad7..044be55 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -22,7 +22,7 @@
     kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
     kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
index cec894e..580b4b2 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
@@ -1,5 +1,6 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index 4bd38d7..0551bab 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - system.rsyslog.client.single
 parameters:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
index 975217b..66a156f 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
@@ -1,5 +1,11 @@
 classes:
 - system.linux.network.dynamic_hosts
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.linux.system.repo.fluentd
 - cluster.virtual-mcp11-k8s-calico.kubernetes
 - cluster.virtual-mcp11-k8s-calico.stacklight
 - cluster.virtual-mcp11-k8s-calico.infra
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 2c58c3d..b4eee22 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
@@ -30,6 +30,8 @@
           enabled: ${_param:kubernetes_virtlet_enabled}
           namespace: kube-system
           image: ${_param:kubernetes_virtlet_image}
+          criproxy_version: ${_param:kubernetes_criproxy_version}
+          criproxy_source: ${_param:kubernetes_criproxy_checksum}
           hosts:
           - ${_param:kubernetes_compute_node01_hostname}
           - ${_param:kubernetes_compute_node02_hostname}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 96120d8..9ba031c 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -1,7 +1,7 @@
 classes:
 - service.etcd.server.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.virtual-mcp11-k8s-calico.kubernetes.compute
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 9b47c2c..8736a3d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -16,6 +16,7 @@
     kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
     kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
     kubernetes_mtu: 1500
+    mcp_version: testing
     etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
 
     # docker package version
@@ -26,11 +27,13 @@
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
     kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
     kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
+    kubernetes_criproxy_version: v0.9.4
+    kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
     kubernetes_externaldns_image: mirantis/external-dns:latest
     kubernetes_externaldns_provider: coredns
 
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index 6c57f52..9737df7 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -1,8 +1,6 @@
 classes:
 - service.grafana.collector
 - system.linux.system.repo.mcp.extra
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
 - system.prometheus.collector
 - system.telegraf.agent
 parameters:
@@ -17,6 +15,7 @@
 
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
 
     mysql_admin_user: root
     mysql_admin_password: workshop
@@ -27,9 +26,9 @@
     galera_server_maintenance_password: workshop
     galera_server_admin_password: workshop
 
-    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
+    fluentd_elasticsearch_host: ${_param:stacklight_log_address}
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 1a4ce9a..2ec9276 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -2,10 +2,10 @@
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.elastic
 - system.linux.system.repo.mcp.apt_mirantis.kibana
-- system.linux.system.repo.influxdb
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.apt_mirantis.docker
 # Needed to install Galera packages
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/.env b/classes/cluster/virtual-mcp11-k8s-contrail/.env
new file mode 100644
index 0000000..e5922db
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="heka"
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 84a8093..5cc9124 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -56,6 +56,8 @@
           enabled: ${_param:kubernetes_virtlet_enabled}
           namespace: kube-system
           image: ${_param:kubernetes_virtlet_image}
+          criproxy_version: ${_param:kubernetes_criproxy_version}
+          criproxy_source: ${_param:kubernetes_criproxy_checksum}
           hosts:
           - ${_param:kubernetes_compute_node01_hostname}
           - ${_param:kubernetes_compute_node02_hostname}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 5d4def2..ff8a2fe 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -28,12 +28,14 @@
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
     kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
 
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
     kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
     kubernetes_externaldns_image: mirantis/external-dns:latest
     kubernetes_externaldns_provider: coredns
+    kubernetes_criproxy_version: v0.9.4
+    kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
 
     # switches of addons
     kubernetes_helm_enabled: true
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
index 8bc1323..daf6489 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
@@ -48,4 +48,3 @@
           source: ${_param:linux_system_repo}
           architectures: amd64
           clean_file: true
-
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
index 7120c15..b361ff2 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
@@ -13,6 +13,7 @@
 - system.neutron.gateway.ironic
 - system.neutron.client.service.ironic
 - service.baremetal_simulator.simulator
+- service.baremetal_simulator.nodes_flat
 - service.baremetal_simulator.network.ovs
 - cluster.virtual-mcp11-ovs-ironic
 parameters:
@@ -105,3 +106,20 @@
           - ${_param:external_interface}
           use_ovs_ports:
           - float-to-ex
+  ironic:
+    api:
+      message_queue:
+        port: ${_param:rabbitmq_port}
+        ssl:
+          enabled: ${_param:rabbitmq_ssl_enabled}
+      database:
+        ssl:
+          enabled: ${_param:galera_ssl_enabled}
+    conductor:
+      message_queue:
+        port: ${_param:rabbitmq_port}
+        ssl:
+          enabled: ${_param:rabbitmq_ssl_enabled}
+      database:
+        ssl:
+          enabled: ${_param:galera_ssl_enabled}
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
index 0a88de2..c217e9e 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
@@ -4,8 +4,11 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
+- system.salt.minion.cert.mysql.server
+- system.salt.minion.cert.rabbitmq_server
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
+- service.rabbitmq.server.ssl
 - system.rabbitmq.server.vhost.openstack
 - system.keystone.server.wsgi
 - system.keystone.server.cluster
@@ -24,6 +27,7 @@
 - system.haproxy.proxy.listen.openstack.nova-placement
 - system.heat.server.cluster
 - system.galera.server.cluster
+- service.galera.ssl
 - system.galera.server.database.ceilometer
 - system.galera.server.database.cinder
 - system.galera.server.database.glance
@@ -40,6 +44,7 @@
     keepalived_vip_interface: ens4
     cluster_vip_address: ${_param:openstack_control_address}
     cluster_local_address: ${_param:single_address}
+    salt_minion_ca_host: cfg01.${linux:system:domain}
   linux:
     system:
       package:
@@ -107,3 +112,12 @@
       notification:
         driver: messagingv2
         topics: "notifications,${_param:stacklight_notification_topic}"
+  ironic:
+    api:
+      message_queue:
+        port: ${_param:rabbitmq_port}
+        ssl:
+          enabled: ${_param:rabbitmq_ssl_enabled}
+      database:
+        ssl:
+          enabled: ${_param:galera_ssl_enabled}
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
index 255c179..46dc8ce 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
@@ -95,6 +95,9 @@
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
     linux_system_repo: 'deb [arch=amd64] http://mirror.fuel-infra.org/mcp-repos/ocata/xenial ocata main'
+    galera_ssl_enabled: true
+    rabbitmq_ssl_enabled: true
+    rabbitmq_port: 5671 # for non-ssl use 5672
   linux:
     network:
       purge_hosts: true
@@ -149,3 +152,7 @@
         root:
           name: root
           password: false
+  salt:
+    minion:
+      trusted_ca_minions:
+        -  cfg01.${linux:system:domain}
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
index faeb96f..a9cbd60 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
@@ -4,7 +4,6 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.horizon.server.single
-- system.horizon.server.plugin.theme
 - cluster.virtual-mcp11-ovs
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
similarity index 69%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
copy to classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index a7c9444..18389dc 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -1,15 +1,12 @@
 classes:
 - service.git.client
 - system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.salt
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
 - system.reclass.storage.salt
-- system.reclass.storage.system.ceph_mon_cluster
-- system.reclass.storage.system.ceph_rgw_cluster
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
@@ -20,28 +17,28 @@
 - system.keystone.client.service.nova-placement
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.keystone.client.service.radosgw-swift
+- system.keystone.client.service.designate
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-offline-pike-ovs.openstack.proxy
+- cluster.virtual-offline-pike-ovs.stacklight.proxy
+- cluster.virtual-offline-pike-ovs
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
     reclass_data_revision: master
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     reclass_config_master: 192.168.10.90
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
       interface:
@@ -56,7 +53,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: ${_param:openstack_proxy_address}
+            host: prx
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:
@@ -138,46 +135,6 @@
           cluster_param:
             stacklight_monitor_node03_address:
               value_template: <<node_control_ip>>
-        ceph_osd_node01:
-          expression: <<node_hostname>>__equals__osd01
-          cluster_param:
-            ceph_osd_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_osd_node02:
-          expression: <<node_hostname>>__equals__osd02
-          cluster_param:
-            ceph_osd_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node01:
-          expression: <<node_hostname>>__equals__cmn01
-          cluster_param:
-            ceph_mon_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node02:
-          expression: <<node_hostname>>__equals__cmn02
-          cluster_param:
-            ceph_mon_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_mon_node03_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node01:
-          expression: <<node_hostname>>__equals__rgw01
-          cluster_param:
-            ceph_rgw_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node02:
-          expression: <<node_hostname>>__equals__rgw02
-          cluster_param:
-            ceph_rgw_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_rgw_node03_address:
-              value_template: <<node_control_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -226,27 +183,6 @@
             external_address: 10.16.0.110
         openstack_proxy_node01:
           classes:
-          - cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
+          - cluster.virtual-offline-pike-ovs.openstack.proxy
           params:
             linux_system_codename: xenial
-        infra_storage_rack01:
-          name: osd0<<count>>
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.ceph.osd
-          repeat:
-            count: 2
-            start: 1
-            digits: 1
-            params:
-              ceph_crush_parent:
-                value: rack<<count>>
-                start: 1
-              single_address:
-                value: ceph_osd_node<<count>>_address
-                start: 1
-                digits: 2
-                interpolate: true
-          params:
-            salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml b/classes/cluster/virtual-offline-pike-ovs/infra/init.yml
similarity index 100%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml
copy to classes/cluster/virtual-offline-pike-ovs/infra/init.yml
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
similarity index 61%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
copy to classes/cluster/virtual-offline-pike-ovs/init.yml
index 83d78df..959ed0b 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -3,7 +3,9 @@
 - service.grafana.collector
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
-- system.linux.system.repo.mcp.extra
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.prometheus.collector
@@ -11,52 +13,42 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight
+- cluster.virtual-offline-pike-ovs.infra
+- cluster.virtual-offline-pike-ovs.openstack
+- cluster.virtual-offline-pike-ovs.stacklight
+
 parameters:
   _param:
-    cluster_domain: virtual-mcp-ocata-dvr-ceph-rgw.local
-    cluster_name: virtual-mcp-ocata-dvr-ceph-rgw
-    # infra service addresses
+    cluster_domain: virtual-offline-pike-ovs.local
+    cluster_name: virtual-offline-pike-ovs
     infra_config_hostname: cfg01
+    local_repos: true
+    local_repo_url: mirror.mcp.mirantis.local.test
+    linux_repo_refresh_db: true
+    aptly_server_address: 10.170.0.226
+    # infra service addresses
     infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_database_address: 172.16.10.254
     openstack_proxy_address: 172.16.10.121
     openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
     openstack_control_node01_address: 172.16.10.101
     openstack_control_node02_address: 172.16.10.102
     openstack_control_node03_address: 172.16.10.103
+    openstack_gateway_address: 172.16.10.110
     openstack_database_address: ${_param:openstack_control_address}
-    openstack_database_node01_address: ${_param:openstack_control_node01_address}
-    openstack_database_node02_address: ${_param:openstack_control_node02_address}
-    openstack_database_node03_address: ${_param:openstack_control_node03_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-    openstack_gateway_address: 172.16.10.110
-    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
-    openstack_dns_node01_address: 172.16.10.111
-    openstack_dns_node02_address: 172.16.10.112
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
-    # ceph addresses
-    ceph_osd_node01_address: 172.16.10.94
-    ceph_osd_node02_address: 172.16.10.95
-    ceph_mon_node01_address: 172.16.10.96
-    ceph_mon_node02_address: 172.16.10.97
-    ceph_mon_node03_address: 172.16.10.98
-    ceph_rgw_address: 10.60.0.75
-    ceph_rgw_node01_address: 10.60.0.76
-    ceph_rgw_node02_address: 10.60.0.77
-    ceph_rgw_node03_address: 10.60.0.78
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
new file mode 100644
index 0000000..b5a3e61
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
@@ -0,0 +1,69 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
+- system.prometheus.exporters.libvirt
+- cluster.virtual-offline-pike-ovs
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 1500
+    linux_system_codename: xenial
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+        notify_on:
+          state_change: vm_and_task_state
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
\ No newline at end of file
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
new file mode 100644
index 0000000..92963cf
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
@@ -0,0 +1,158 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.keystone.server.wsgi
+- system.keystone.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.cluster
+- system.glance.control.cluster
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.heat.server.cluster
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
+- system.galera.server.cluster
+- system.galera.server.database.aodh
+- system.galera.server.database.ceilometer
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.grafana
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- system.galera.server.database.designate
+- system.haproxy.proxy.listen.openstack.nova-placement
+- cluster.virtual-offline-pike-ovs
+parameters:
+  _param:
+    keepalived_vip_interface: ens4
+  linux:
+    system:
+      package:
+        python-msgpack:
+          version: latest
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+  keepalived:
+    cluster:
+      instance:
+        VIP:
+          virtual_router_id: 150
+  bind:
+    server:
+      control:
+        mgmt:
+          enabled: true
+          bind:
+            address: ${_param:single_address}
+            port: 953
+          allow:
+            - ${_param:openstack_control_node01_address}
+            - ${_param:openstack_control_node02_address}
+            - ${_param:openstack_control_node03_address}
+          keys:
+            - designate
+  keystone:
+    server:
+      admin_email: ${_param:admin_email}
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  designate:
+    server:
+      pools:
+        default:
+          description: 'test pool'
+          targets:
+            default:
+              description: 'test target1'
+            default1:
+              type: ${_param:designate_pool_target_type}
+              description: 'test target2'
+              masters: ${_param:designate_pool_target_masters}
+              options:
+                host: ${_param:openstack_control_node02_address}
+                port: 53
+                rndc_host: ${_param:openstack_control_node02_address}
+                rndc_port: 953
+                rndc_key_file: /etc/designate/rndc.key
+            default2:
+              type: ${_param:designate_pool_target_type}
+              description: 'test target3'
+              masters: ${_param:designate_pool_target_masters}
+              options:
+                host: ${_param:openstack_control_node03_address}
+                port: 53
+                rndc_host: ${_param:openstack_control_node03_address}
+                rndc_port: 953
+                rndc_key_file: /etc/designate/rndc.key
+      quota:
+        zones: ${_param:designate_quota_zones}
+    worker:
+      enabled: ${_param:designate_worker_enabled}
+  glance:
+    server:
+      storage:
+        engine: file
+      images: []
+      workers: 1
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  heat:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  neutron:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  nova:
+    controller:
+      networking: dvr
+      cpu_allocation: 54
+      metadata:
+        password: ${_param:metadata_password}
+      bind:
+        private_address: ${_param:cluster_local_address}
+        public_address: ${_param:cluster_vip_address}
+        novncproxy_port: 6080
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      workers: 1
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  cinder:
+    volume:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+    controller:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
new file mode 100644
index 0000000..5b222ee
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.horizon.server.single
+- cluster.virtual-offline-pike-ovs
+parameters:
+  _param:
+    horizon_site_branding: OpenStack Dashboard
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
new file mode 100644
index 0000000..6e18bf7
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
@@ -0,0 +1,81 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.neutron.gateway.cluster
+- cluster.virtual-offline-pike-ovs
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          mtu: ${_param:interface_mtu}
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_interface}
+          use_ovs_ports:
+          - float-to-ex
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
new file mode 100644
index 0000000..c18b5bd
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
@@ -0,0 +1,177 @@
+parameters:
+  _param:
+    openstack_version: pike
+    cinder_version: ${_param:openstack_version}
+    apt_mk_version: testing
+    mcp_version: 2018.1
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    neutron_control_dvr: False
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: False
+    neutron_gateway_agent_mode: legacy
+    neutron_compute_dvr: False
+    neutron_compute_agent_mode: legacy
+    neutron_compute_external_access: False
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    designate_admin_api_enabled: true
+    designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+    designate_quota_zones: 40
+    designate_pool_ns_records:
+      - hostname: 'ns1.example.org.'
+        priority: 10
+    designate_pool_nameservers:
+      - host: ${_param:openstack_control_node01_address}
+        port: 53
+      - host: ${_param:openstack_control_node02_address}
+        port: 53
+      - host: ${_param:openstack_control_node03_address}
+        port: 53
+    designate_pool_target_type: bind9
+    designate_pool_target_masters:
+      - host: ${_param:openstack_control_node01_address}
+        port: 5354
+      - host: ${_param:openstack_control_node02_address}
+        port: 5354
+      - host: ${_param:openstack_control_node03_address}
+        port: 5354
+    designate_pool_target_options:
+      host: ${_param:openstack_control_node01_address}
+      port: 53
+      rndc_host: ${_param:openstack_control_node01_address}
+      rndc_port: 953
+      rndc_key_file: /etc/designate/rndc.key
+    designate_version: ${_param:openstack_version}
+    designate_worker_enabled: true
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: ${_param:cluster_vip_address}
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    designate_service_host: ${_param:cluster_vip_address}
+    metadata_password: workshop
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+    mysql_cinder_password: workshop
+    mysql_ceilometer_password: workshop
+    mysql_glance_password: workshop
+    mysql_grafana_password: workshop
+    mysql_heat_password: workshop
+    mysql_keystone_password: workshop
+    mysql_neutron_password: workshop
+    mysql_nova_password: workshop
+    mysql_aodh_password: workshop
+    mysql_designate_password: workshop
+    keystone_service_token: workshop
+    keystone_admin_password: workshop
+    keystone_ceilometer_password: workshop
+    keystone_aodh_password: workshop
+    keystone_cinder_password: workshop
+    keystone_glance_password: workshop
+    keystone_heat_password: workshop
+    keystone_keystone_password: workshop
+    keystone_neutron_password: workshop
+    keystone_nova_password: workshop
+    keystone_designate_password: workshop
+    ceilometer_secret_key: workshop
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 2
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
+  linux:
+    network:
+      purge_hosts: true
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
similarity index 82%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
copy to classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
index a37f4fb..e055dee 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
@@ -3,9 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.ceph_radosgw
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-offline-pike-ovs
 parameters:
   _param:
     nginx_proxy_ssl:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml b/classes/cluster/virtual-offline-pike-ovs/stacklight/client.yml
similarity index 94%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
copy to classes/cluster/virtual-offline-pike-ovs/stacklight/client.yml
index ac069dd..e12d70a 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/stacklight/client.yml
@@ -4,7 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-offline-pike-ovs
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/virtual-offline-pike-ovs/stacklight/init.yml b/classes/cluster/virtual-offline-pike-ovs/stacklight/init.yml
new file mode 100644
index 0000000..883bad0
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs/stacklight/init.yml
@@ -0,0 +1,35 @@
+parameters:
+  _param:
+    linux_system_codename: xenial
+    prometheus_control_address: ${_param:stacklight_monitor_address}
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_port: 9200
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml b/classes/cluster/virtual-offline-pike-ovs/stacklight/proxy.yml
similarity index 92%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
copy to classes/cluster/virtual-offline-pike-ovs/stacklight/proxy.yml
index 14634e8..035c74d 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/stacklight/proxy.yml
@@ -5,7 +5,7 @@
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-offline-pike-ovs
 parameters:
   _param:
     nginx_proxy_grafana_port: 15013
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
similarity index 66%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
copy to classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
index d47b429..e0da677 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
@@ -1,9 +1,10 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
-- system.linux.system.repo.mcp.apt_mirantis.docker
+- system.linux.system.repo_local.mcp.apt_mirantis.influxdb
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana
+- system.linux.system.repo_local.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
@@ -27,7 +28,7 @@
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-offline-pike-ovs
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
@@ -45,14 +46,14 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-    docker_image_alertmanager: docker-prod-local.artifactory.mirantis.com/openstack-docker/alertmanager:${_param:apt_mk_version}
-    docker_image_pushgateway: docker-prod-local.artifactory.mirantis.com/openstack-docker/pushgateway:${_param:apt_mk_version}
-    docker_image_prometheus: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus:${_param:apt_mk_version}
-    docker_image_remote_agent: docker-prod-local.artifactory.mirantis.com/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
-    docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
-    docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
-    docker_image_grafana: grafana/grafana:4.5.2
+    docker_image_alertmanager: apt:5000/alertmanager:${_param:apt_mk_version}
+    docker_image_pushgateway: apt:5000/pushgateway:${_param:apt_mk_version}
+    docker_image_prometheus: apt:5000/prometheus:${_param:apt_mk_version}
+    docker_image_remote_agent: apt:5000/telegraf:${_param:apt_mk_version}
+    docker_image_remote_storage_adapter: apt:5000/remote_storage_adapter:${_param:apt_mk_version}
+    docker_image_remote_collector: apt:5000/heka:${_param:apt_mk_version}
+    docker_image_prometheus_relay: apt:5000/prometheus_relay:${_param:apt_mk_version}
+    docker_image_grafana: apt:5000/grafana:${_param:apt_mk_version}
     influxdb_port: 8086
     influxdb_admin_password: password
     influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
similarity index 69%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
copy to classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
index a7c9444..4c55eee 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
@@ -2,46 +2,41 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
 - system.reclass.storage.salt
-- system.reclass.storage.system.ceph_mon_cluster
-- system.reclass.storage.system.ceph_rgw_cluster
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
 - system.keystone.client.single
-- system.keystone.client.service.aodh
 - system.keystone.client.service.ceilometer
 - system.keystone.client.service.nova21
-- system.keystone.client.service.nova-placement
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.keystone.client.service.radosgw-swift
+- system.keystone.client.service.designate
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.stacklight_server_cluster
 - system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.stacklight.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- system.reclass.storage.system.openstack_gateway_single
+- cluster.virtual-pike-ovs-dpdk.openstack.proxy
+- cluster.virtual-pike-ovs-dpdk.stacklight.proxy
+- cluster.virtual-pike-ovs-dpdk
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
     reclass_data_revision: master
     salt_master_environment_repository: "https://github.com/tcpcloud"
     salt_master_environment_revision: master
-    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     reclass_config_master: 192.168.10.90
     single_address: 172.16.10.100
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
       interface:
@@ -56,7 +51,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: ${_param:openstack_proxy_address}
+            host: prx
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:
@@ -138,46 +133,6 @@
           cluster_param:
             stacklight_monitor_node03_address:
               value_template: <<node_control_ip>>
-        ceph_osd_node01:
-          expression: <<node_hostname>>__equals__osd01
-          cluster_param:
-            ceph_osd_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_osd_node02:
-          expression: <<node_hostname>>__equals__osd02
-          cluster_param:
-            ceph_osd_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node01:
-          expression: <<node_hostname>>__equals__cmn01
-          cluster_param:
-            ceph_mon_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node02:
-          expression: <<node_hostname>>__equals__cmn02
-          cluster_param:
-            ceph_mon_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_mon_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_mon_node03_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node01:
-          expression: <<node_hostname>>__equals__rgw01
-          cluster_param:
-            ceph_rgw_node01_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node02:
-          expression: <<node_hostname>>__equals__rgw02
-          cluster_param:
-            ceph_rgw_node02_address:
-              value_template: <<node_control_ip>>
-        ceph_rgw_node03:
-          expression: <<node_hostname>>__equals__cmn03
-          cluster_param:
-            ceph_rgw_node03_address:
-              value_template: <<node_control_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -212,11 +167,15 @@
           - system.influxdb.database.stacklight
         openstack_compute_node01:
           params:
+            dpdk0_name: ens5
+            dpdk0_pci: '"0000:00:05.0"'
             single_address: 172.16.10.105
             tenant_address: 10.1.0.105
             external_address: 10.16.0.105
         openstack_compute_node02:
           params:
+            dpdk0_name: ens5
+            dpdk0_pci: '"0000:00:05.0"'
             single_address: 172.16.10.106
             tenant_address: 10.1.0.106
             external_address: 10.16.0.106
@@ -226,27 +185,6 @@
             external_address: 10.16.0.110
         openstack_proxy_node01:
           classes:
-          - cluster.virtual-mcp-ocata-dvr-ceph-rgw.openstack.proxy
+          - cluster.virtual-pike-ovs-dpdk.openstack.proxy
           params:
             linux_system_codename: xenial
-        infra_storage_rack01:
-          name: osd0<<count>>
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.ceph.osd
-          repeat:
-            count: 2
-            start: 1
-            digits: 1
-            params:
-              ceph_crush_parent:
-                value: rack<<count>>
-                start: 1
-              single_address:
-                value: ceph_osd_node<<count>>_address
-                start: 1
-                digits: 2
-                interpolate: true
-          params:
-            salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/infra/init.yml
similarity index 100%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml
copy to classes/cluster/virtual-pike-ovs-dpdk/infra/init.yml
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/init.yml
new file mode 100644
index 0000000..1fd9136
--- /dev/null
+++ b/classes/cluster/virtual-pike-ovs-dpdk/init.yml
@@ -0,0 +1,41 @@
+classes:
+- system.linux.network.dynamic_hosts
+- system.linux.system.single
+- cluster.virtual-pike-ovs-dpdk.infra
+- cluster.virtual-pike-ovs-dpdk.openstack
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.stacklight
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-pike-ovs-dpdk.stacklight
+- cluster.virtual-pike-ovs-dpdk.stacklight.client
+
+parameters:
+  _param:
+    cluster_domain: virtual-pike-ovs-dpdk.local
+    cluster_name: virtual-pike-ovs-dpdk
+    # infra service addresses
+    infra_config_hostname: cfg01
+    infra_config_address: 172.16.10.100
+    # openstack service addresses
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
+    openstack_control_address: 172.16.10.254
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
+    openstack_database_address: ${_param:openstack_control_address}
+    openstack_message_queue_address: ${_param:openstack_control_address}
+    openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+    openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+    openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+    # stacklight service addresses
+    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_node01_address: 172.16.10.107
+    stacklight_monitor_node02_address: 172.16.10.108
+    stacklight_monitor_node03_address: 172.16.10.109
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/compute.yml
new file mode 100644
index 0000000..ace5f15
--- /dev/null
+++ b/classes/cluster/virtual-pike-ovs-dpdk/openstack/compute.yml
@@ -0,0 +1,91 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.heka.alarm.openstack_compute
+- system.nova.compute.nfv.hugepages
+- system.nova.compute.nfv.cpu_pinning
+- system.neutron.compute.nfv.dpdk
+
+- cluster.virtual-pike-ovs-dpdk
+parameters:
+  _param:
+    primary_interface: ens4
+    #tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+        notify_on:
+          state_change: vm_and_task_state
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        #tenant_interface:
+        #  enabled: true
+        #  name: ${_param:tenant_interface}
+        #  mtu: ${_param:interface_mtu}
+        #  proto: manual
+        #  type: eth
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:primary_interface}
+        # br-mesh:
+        #   enabled: true
+        #   type: bridge
+        #   proto: static
+        #   address: ${_param:tenant_address}
+        #   netmask: 255.255.255.0
+        #   use_interfaces:
+        #   - ${_param:tenant_interface}
+###
+        # dpdkbond1:
+        #   enabled: true
+        #   bridge: br-prv
+        #   type: dpdk_ovs_bond
+        #   mode: active-backup
+        dpdk0:
+          name: ${_param:dpdk0_name}
+          pci: ${_param:dpdk0_pci}
+          driver: igb_uio
+          bridge: br-prv
+#          bond: dpdkbond1
+          enabled: true
+          type: dpdk_ovs_port
+          n_rxq: 2
+        br-prv:
+          enabled: true
+          type: dpdk_ovs_bridge
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/control.yml
similarity index 62%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
copy to classes/cluster/virtual-pike-ovs-dpdk/openstack/control.yml
index 3686c44..11a048c 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/openstack/control.yml
@@ -16,16 +16,14 @@
 - system.glusterfs.server.volume.keystone
 - system.glusterfs.server.cluster
 - system.glance.control.cluster
+- system.heka.alarm.openstack_control
 - system.nova.control.cluster
 - system.neutron.control.openvswitch.cluster
 - system.cinder.control.cluster
 - system.heat.server.cluster
-- system.ceilometer.server.cluster
-- system.ceilometer.server.backend.influxdb
-- system.aodh.server.cluster
-- system.heka.ceilometer_collector.single
+- system.designate.server.cluster
+- system.designate.server.backend.bind
 - system.galera.server.cluster
-- system.galera.server.database.aodh
 - system.galera.server.database.ceilometer
 - system.galera.server.database.cinder
 - system.galera.server.database.glance
@@ -33,17 +31,8 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
-- system.haproxy.proxy.listen.openstack.nova-placement
-- system.glance.control.storage.ceph
-- system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.ceph.common
-- system.cinder.control.backend.ceph
-- system.cinder.control.cluster
-- system.cinder.control.notification.messagingv2
-- system.cinder.volume.single
-- system.cinder.volume.notification.messagingv2
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw.infra
-- cluster.virtual-mcp-ocata-dvr
+- system.galera.server.database.designate
+- cluster.virtual-pike-ovs-dpdk
 parameters:
   _param:
     keepalived_vip_interface: ens4
@@ -65,14 +54,60 @@
       instance:
         VIP:
           virtual_router_id: 150
+  bind:
+    server:
+      control:
+        mgmt:
+          enabled: true
+          bind:
+            address: ${_param:single_address}
+            port: 953
+          allow:
+            - ${_param:openstack_control_node01_address}
+            - ${_param:openstack_control_node02_address}
+            - ${_param:openstack_control_node03_address}
+          keys:
+            - designate
   keystone:
     server:
       admin_email: ${_param:admin_email}
       notification:
         driver: messagingv2
         topics: "notifications,${_param:stacklight_notification_topic}"
+  designate:
+    server:
+      pools:
+        default:
+          description: 'test pool'
+          targets:
+            default:
+              description: 'test target1'
+            default1:
+              type: ${_param:designate_pool_target_type}
+              description: 'test target2'
+              masters: ${_param:designate_pool_target_masters}
+              options:
+                host: ${_param:openstack_control_node02_address}
+                port: 53
+                rndc_host: ${_param:openstack_control_node02_address}
+                rndc_port: 953
+                rndc_key_file: /etc/designate/rndc.key
+            default2:
+              type: ${_param:designate_pool_target_type}
+              description: 'test target3'
+              masters: ${_param:designate_pool_target_masters}
+              options:
+                host: ${_param:openstack_control_node03_address}
+                port: 53
+                rndc_host: ${_param:openstack_control_node03_address}
+                rndc_port: 953
+                rndc_key_file: /etc/designate/rndc.key
+    worker:
+      enabled: ${_param:designate_worker_enabled}
   glance:
     server:
+      storage:
+        engine: file
       images: []
       workers: 1
       notification:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/dashboard.yml
similarity index 87%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
copy to classes/cluster/virtual-pike-ovs-dpdk/openstack/dashboard.yml
index f7c7052..73233a2 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/openstack/dashboard.yml
@@ -4,7 +4,8 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.horizon.server.single
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- system.horizon.server.plugin.theme
+- cluster.virtual-pike-ovs-dpdk
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/gateway.yml
new file mode 100644
index 0000000..65ad393
--- /dev/null
+++ b/classes/cluster/virtual-pike-ovs-dpdk/openstack/gateway.yml
@@ -0,0 +1,88 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.neutron.gateway.cluster
+- cluster.virtual-pike-ovs-dpdk
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        # tenant_interface:
+        #   enabled: true
+        #   name: ${_param:tenant_interface}
+        #   mtu: ${_param:interface_mtu}
+        #   proto: manual
+        #   type: eth
+        external_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          mtu: ${_param:interface_mtu}
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-prv:
+          enabled: true
+          type: ovs_bridge
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+        floating-to-prv:
+          enabled: true
+          type: ovs_port
+          port_type: patch
+          bridge: br-floating
+          peer: prv-to-floating
+        prv-to-floating:
+          enabled: true
+          type: ovs_port
+          port_type: patch
+          bridge: br-prv
+          peer: floating-to-prv
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_interface}
+          use_ovs_ports:
+          - float-to-ex
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml
new file mode 100644
index 0000000..d68f04c
--- /dev/null
+++ b/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml
@@ -0,0 +1,183 @@
+parameters:
+  _param:
+    openstack_version: pike
+    apt_mk_version: nightly
+    cinder_version: ${_param:openstack_version}
+    mcp_repo_version: 1.1
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    neutron_control_dvr: False
+    neutron_tenant_network_types: "flat"
+    neutron_l3_ha: True
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: False
+    neutron_gateway_agent_mode: legacy
+    neutron_compute_dvr: False
+    neutron_compute_agent_mode: legacy
+    neutron_compute_external_access: False
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+
+    nova_cpu_pinning: "3"
+    compute_hugepages_size: 2M
+    compute_hugepages_count: 600
+    compute_hugepages_mount: /mnt/hugepages_2M
+    compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
+    compute_dpdk_driver: uio
+    compute_ovs_pmd_cpu_mask: "0x2"
+    compute_ovs_dpdk_socket_mem: "1024"
+    compute_ovs_dpdk_lcore_mask: "0x1"
+    compute_ovs_memory_channels: "1"
+
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
+    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+    designate_pool_ns_records:
+      - hostname: 'ns1.example.org.'
+        priority: 10
+    designate_pool_nameservers:
+      - host: ${_param:openstack_control_node01_address}
+        port: 53
+      - host: ${_param:openstack_control_node02_address}
+        port: 53
+      - host: ${_param:openstack_control_node03_address}
+        port: 53
+    designate_pool_target_type: bind9
+    designate_pool_target_masters:
+      - host: ${_param:openstack_control_node01_address}
+        port: 5354
+      - host: ${_param:openstack_control_node02_address}
+        port: 5354
+      - host: ${_param:openstack_control_node03_address}
+        port: 5354
+    designate_pool_target_options:
+      host: ${_param:openstack_control_node01_address}
+      port: 53
+      rndc_host: ${_param:openstack_control_node01_address}
+      rndc_port: 953
+      rndc_key_file: /etc/designate/rndc.key
+    designate_version: ${_param:openstack_version}
+    designate_worker_enabled: true
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: 172.16.10.108
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    designate_service_host: ${_param:cluster_vip_address}
+    metadata_password: workshop
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+    mysql_cinder_password: workshop
+    mysql_ceilometer_password: workshop
+    mysql_designate_password: workshop
+    mysql_glance_password: workshop
+    mysql_grafana_password: workshop
+    mysql_heat_password: workshop
+    mysql_keystone_password: workshop
+    mysql_neutron_password: workshop
+    mysql_nova_password: workshop
+    mysql_aodh_password: workshop
+    keystone_service_token: workshop
+    keystone_admin_password: workshop
+    keystone_ceilometer_password: workshop
+    keystone_cinder_password: workshop
+    keystone_glance_password: workshop
+    keystone_heat_password: workshop
+    keystone_keystone_password: workshop
+    keystone_neutron_password: workshop
+    keystone_nova_password: workshop
+    keystone_designate_password: workshop
+    ceilometer_secret_key: workshop
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 2
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+  linux:
+    network:
+      purge_hosts: true
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/proxy.yml
similarity index 82%
copy from classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
copy to classes/cluster/virtual-pike-ovs-dpdk/openstack/proxy.yml
index a37f4fb..55c8561 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/openstack/proxy.yml
@@ -3,9 +3,8 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.ceph_radosgw
 - system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+- cluster.virtual-pike-ovs-dpdk
 parameters:
   _param:
     nginx_proxy_ssl:
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/client.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/client.yml
new file mode 100644
index 0000000..a5d04ef
--- /dev/null
+++ b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/client.yml
@@ -0,0 +1,6 @@
+classes:
+- system.collectd.client.output.heka
+- system.heka.log_collector.single
+- system.heka.metric_collector.single
+- cluster.virtual-pike-ovs-dpdk.stacklight
+- service.grafana.collector
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/init.yml
new file mode 100644
index 0000000..48bffdc
--- /dev/null
+++ b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/init.yml
@@ -0,0 +1,48 @@
+parameters:
+  _param:
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    heka_aggregator_host: ${_param:stacklight_monitor_address}
+    aggregator_port: 5565
+    grafana_user: admin
+    grafana_password: password
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    elasticsearch_port: 9200
+    influxdb_stacklight_password: lmapass
+    influxdb_admin_password: password
+    influxdb_port: 8086
+    influxdb_database: lma
+    influxdb_user: lma
+    influxdb_password: lmapass
+    nagios_host: ${_param:stacklight_monitor_address}
+    nagios_status_port: 8001
+    nagios_username: nagiosadmin
+    nagios_password: secret
+    nagios_notification_smtp_server: 127.0.0.1
+    nagios_notification_from: 'nagios@localhost'
+    nagios_notification_email: 'root@localhost'
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/proxy.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/proxy.yml
new file mode 100644
index 0000000..ffec6cd
--- /dev/null
+++ b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.grafana_web
+- system.nginx.server.proxy.kibana_web
+- system.nginx.server.proxy.nagios_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-pike-ovs-dpdk
+parameters:
+  _param:
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/server.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/server.yml
new file mode 100644
index 0000000..df7f95e
--- /dev/null
+++ b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/server.yml
@@ -0,0 +1,48 @@
+classes:
+- system.collectd.remote_client.cluster
+- system.heka.remote_collector.cluster
+- system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.docker
+- system.heka.remote_collector.input.amqp
+- system.heka.aggregator.cluster
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.grafana.server.single
+- system.nagios.server.cluster
+- cluster.virtual-pike-ovs-dpdk
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.grafana
+- service.haproxy.proxy.single
+- system.keepalived.cluster.instance.stacklight_monitor_vip
+parameters:
+  _param:
+    collectd_remote_collector_host: ${_param:stacklight_monitor_address}
+    heka_amqp_host: ${_param:openstack_control_address}
+    kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_password: 'password'
+    keepalived_stacklight_monitor_vip_interface: ens4
+    cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
+    cluster_node01_name: mon01
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_name: mon02
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_name: mon03
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/system b/classes/system
index 9d2e769..0d27d17 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 9d2e769909eb21b3de8cdbe7d84ad2ff59bb8660
+Subproject commit 0d27d17077d37faa687f0ab55cdc30fe39fe8502