diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index 2b04e1f..c3e9ea2 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -1,5 +1,6 @@
 classes:
 - service.git.client
+- service.opencontrail.test.single
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index fc3b493..ff21331 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -76,3 +76,5 @@
             route_target: 10000
             external: True
             rpf: 'disable'
+            domain: 'default-domain'
+            project: 'default-project'
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/cephfs.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/cephfs.yml
new file mode 100644
index 0000000..e4fe9bb
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/cephfs.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- cluster.virtual-mcp-ocata-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-ocata-dvr-ceph-rgw/ceph/common.yml
new file mode 100644
index 0000000..7da40e1
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/common.yml
@@ -0,0 +1,24 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.ceph
+- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+parameters:
+  ceph:
+    common:
+      public_network: 10.60.0.0/24
+      cluster_network: 10.70.0.0/24
+      keyring:
+        glance:
+          name: ${_param:glance_storage_user}
+          caps:
+            mon: "allow r"
+            osd: "allow class-read object_prefix rdb_children, allow rwx pool=images"
+        cinder:
+          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"
+        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
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/init.yml
new file mode 100644
index 0000000..94ebad2
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/init.yml
@@ -0,0 +1,76 @@
+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_rgw_hostname: rgw
+    ceph_rgw_node01_hostname: rgw01
+    ceph_rgw_node02_hostname: rgw02
+    ceph_rgw_node03_hostname: rgw03
+    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
+
+    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}
+        rgw:
+          address: ${_param:ceph_rgw_address}
+          names:
+          - ${_param:ceph_rgw_hostname}
+          - ${_param:ceph_rgw_hostname}.${_param:cluster_domain}
+        rgw01:
+          address: ${_param:ceph_rgw_node01_address}
+          names:
+          - ${_param:ceph_rgw_node01_hostname}
+          - ${_param:ceph_rgw_node01_hostname}.${_param:cluster_domain}
+        rgw02:
+          address: ${_param:ceph_rgw_node02_address}
+          names:
+          - ${_param:ceph_rgw_node02_hostname}
+          - ${_param:ceph_rgw_node02_hostname}.${_param:cluster_domain}
+        rgw03:
+          address: ${_param:ceph_rgw_node03_address}
+          names:
+          - ${_param:ceph_rgw_node03_hostname}
+          - ${_param:ceph_rgw_node03_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-rgw/ceph/mon.yml
new file mode 100644
index 0000000..2f46c26
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/mon.yml
@@ -0,0 +1,16 @@
+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
+parameters:
+  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/ceph/osd.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
new file mode 100644
index 0000000..eac413b
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/osd.yml
@@ -0,0 +1,29 @@
+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
+parameters:
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+
+  ceph:
+    osd:
+      enabled: true
+      crush_parent: ${_param:ceph_crush_parent}
+      bluestore_block_db_size: 900000000
+      bluestore_block_wal_size: 900000000
+      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-rgw/ceph/rgw.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/rgw.yml
new file mode 100644
index 0000000..33a8251
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/rgw.yml
@@ -0,0 +1,46 @@
+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
+parameters:
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+  _param:
+    keepalived_vip_interface: ens4
+    keepalived_vip_virtual_router_id: 41
+    haproxy_radosgw_bind_port: 8080
+    haproxy_radosgw_source_port: 8080
+    ceph_radosgw_bind_port: 8080
+    keepalived_vip_password: 9HpXQgHKxL1
+    cluster_vip_address: ${_param:ceph_rgw_address}
+    cluster_node01_hostname: ${_param:ceph_rgw_node01_hostname}
+    cluster_node01_address: ${_param:ceph_rgw_node01_address}
+    cluster_node02_hostname: ${_param:ceph_rgw_node02_hostname}
+    cluster_node02_address: ${_param:ceph_rgw_node02_address}
+    cluster_node03_hostname: ${_param:ceph_rgw_node03_hostname}
+    cluster_node03_address: ${_param:ceph_rgw_node03_address}
+    ceph_radosgw_keystone_host: ${_param:openstack_control_address}
+    ceph_radosgw_keystone_password: ${_param:keystone_admin_password}
+  ceph:
+    common:
+      keyring:
+        rgw.rgw01:
+          caps:
+            mon: "allow *"
+            osd: "allow *"
+        rgw.rgw02:
+          caps:
+            mon: "allow *"
+            osd: "allow *"
+        rgw.rgw03:
+          caps:
+            mon: "allow *"
+            osd: "allow *"
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/setup.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/setup.yml
new file mode 100644
index 0000000..ad3fd39
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/ceph/setup.yml
@@ -0,0 +1,70 @@
+classes:
+- system.ceph.mon.cluster_init
+- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+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
+        .rgw.root:
+          pg_num: 32
+          pgp_num: 32
+          size: 2
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.control:
+          pg_num: 32
+          pgp_num: 32
+          size: 2
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.meta:
+          pg_num: 32
+          pgp_num: 32
+          size: 2
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.log:
+          pg_num: 32
+          pgp_num: 32
+          size: 2
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.buckets.index:
+          pg_num: 32
+          pgp_num: 32
+          size: 2
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.buckets.data:
+          pg_num: 32
+          pgp_num: 32
+          size: 2
+          type: replicated
+          application: rgw
+          crush_rule: sata
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
new file mode 100644
index 0000000..a7c9444
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/config.yml
@@ -0,0 +1,252 @@
+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.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.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
+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}
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_web:
+          proxy:
+            host: ${_param:openstack_proxy_address}
+        nginx_proxy_openstack_api_heat_cfn:
+          enabled: false
+  salt:
+    master:
+      reactor:
+        reclass/minion/classify:
+        - salt://reclass/reactor/node_register.sls
+  reclass:
+    storage:
+      class_mapping:
+        common_node:
+          expression: all
+          node_param:
+            single_address:
+              value_template: <<node_control_ip>>
+            linux_system_codename:
+              value_template: <<node_os>>
+            salt_master_host:
+              value_template: <<node_master_ip>>
+        infra_config:
+          expression: <<node_hostname>>__startswith__cfg
+          cluster_param:
+            infra_config_address:
+              value_template: <<node_control_ip>>
+            infra_config_deploy_address:
+              value_template: <<node_deploy_ip>>
+            cluster_domain:
+              value_template: <<node_domain>>
+        openstack_control01:
+          expression: <<node_hostname>>__equals__ctl01
+          cluster_param:
+            openstack_control_node01_address:
+              value_template: <<node_control_ip>>
+        openstack_control02:
+          expression: <<node_hostname>>__equals__ctl02
+          cluster_param:
+            openstack_control_node02_address:
+              value_template: <<node_control_ip>>
+        openstack_control03:
+          expression: <<node_hostname>>__equals__ctl03
+          cluster_param:
+            openstack_control_node03_address:
+              value_template: <<node_control_ip>>
+        openstack_compute:
+          expression: <<node_hostname>>__startswith__cmp
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.compute
+          node_param:
+            tenant_address:
+              value_template: <<node_tenant_ip>>
+            external_address:
+              value_template: <<node_external_ip>>
+        openstack_gateway:
+          expression: <<node_hostname>>__startswith__gtw
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.gateway
+          node_param:
+            tenant_address:
+              value_template: <<node_tenant_ip>>
+            external_address:
+              value_template: <<node_external_ip>>
+          cluster_param:
+            openstack_gateway_node01_address:
+              value_template: <<node_control_ip>>
+        stacklight_monitor_node01:
+          expression: <<node_hostname>>__equals__mon01
+          cluster_param:
+            stacklight_monitor_node01_address:
+              value_template: <<node_control_ip>>
+        stacklight_monitor_node02:
+          expression: <<node_hostname>>__equals__mon02
+          cluster_param:
+            stacklight_monitor_node02_address:
+              value_template: <<node_control_ip>>
+        stacklight_monitor_node03:
+          expression: <<node_hostname>>__equals__mon03
+          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:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.dashboard
+              - cluster.<<node_cluster>>.openstack.proxy
+          cluster_param:
+            openstack_proxy_node01_address:
+              value_template: <<node_control_ip>>
+      node:
+        openstack_control_node01:
+          classes:
+          - service.galera.master.cluster
+          params:
+            mysql_cluster_role: master
+            linux_system_codename: xenial
+        openstack_control_node02:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+            linux_system_codename: xenial
+        openstack_control_node03:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+            linux_system_codename: xenial
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
+        openstack_compute_node01:
+          params:
+            single_address: 172.16.10.105
+            tenant_address: 10.1.0.105
+            external_address: 10.16.0.105
+        openstack_compute_node02:
+          params:
+            single_address: 172.16.10.106
+            tenant_address: 10.1.0.106
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp-ocata-dvr-ceph-rgw.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-ocata-dvr-ceph-rgw/infra/init.yml
new file mode 100644
index 0000000..b01723d
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/infra/init.yml
@@ -0,0 +1,14 @@
+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}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
new file mode 100644
index 0000000..83d78df
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/init.yml
@@ -0,0 +1,62 @@
+classes:
+- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
+- system.linux.system.repo.mcp.extra
+- system.linux.system.single
+- system.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
+- 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
+parameters:
+  _param:
+    cluster_domain: virtual-mcp-ocata-dvr-ceph-rgw.local
+    cluster_name: virtual-mcp-ocata-dvr-ceph-rgw
+    # infra service addresses
+    infra_config_hostname: cfg01
+    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_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
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml
new file mode 100644
index 0000000..56d32f7
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/compute.yml
@@ -0,0 +1,40 @@
+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.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
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    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
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
new file mode 100644
index 0000000..3686c44
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/control.yml
@@ -0,0 +1,114 @@
+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.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.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.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
+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
+  keystone:
+    server:
+      admin_email: ${_param:admin_email}
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  glance:
+    server:
+      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-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
new file mode 100644
index 0000000..f7c7052
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- 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.mcp.apt_mirantis.saltstack_2016_3
+- system.horizon.server.single
+- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+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-rgw/openstack/gateway.yml
new file mode 100644
index 0000000..eaa543f
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/gateway.yml
@@ -0,0 +1,21 @@
+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.interface.single_ovs_dvr
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    neutron_gateway_dvr: True
+    neutron_gateway_agent_mode: dvr_snat
+    linux_system_codename: xenial
+  neutron:
+    gateway:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/init.yml
new file mode 100644
index 0000000..a0a25d4
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/init.yml
@@ -0,0 +1,156 @@
+parameters:
+  _param:
+    openstack_version: pike
+    apt_mk_version: testing
+    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
+    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: 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
+    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
+    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
+    radosgw_swift_cluster_port: 8080
+    keystone_swift_password: 5gNyti1OxSxRay4d
+    radosgw_service_host: ${_param:ceph_rgw_address}
+  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-rgw/openstack/proxy.yml
new file mode 100644
index 0000000..a37f4fb
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/openstack/proxy.yml
@@ -0,0 +1,16 @@
+classes:
+- system.nginx.server.single
+- 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
+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}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
new file mode 100644
index 0000000..ac069dd
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/client.yml
@@ -0,0 +1,22 @@
+classes:
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+- cluster.virtual-mcp-ocata-dvr-ceph-rgw
+parameters:
+  _param:
+    # Elasticsearch/Kibana client parameters
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    # Grafana client parameters
+    grafana_address: ${_param:stacklight_monitor_address}
+    grafana_port: 15013
+    grafana_user: admin
+    grafana_password: ${_param:grafana_admin_password}
+    grafana_prometheus_address: ${_param:stacklight_monitor_address}
+    grafana_prometheus_port: 15016
+
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/init.yml
new file mode 100644
index 0000000..0b10c03
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/init.yml
@@ -0,0 +1,34 @@
+parameters:
+  _param:
+    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-rgw/stacklight/proxy.yml
new file mode 100644
index 0000000..14634e8
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/proxy.yml
@@ -0,0 +1,17 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- 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
+parameters:
+  _param:
+    nginx_proxy_grafana_port: 15013
+    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-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
new file mode 100644
index 0000000..d47b429
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-rgw/stacklight/server.yml
@@ -0,0 +1,72 @@
+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.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
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
+- service.haproxy.proxy.single
+- system.influxdb.relay.cluster
+- system.influxdb.server.single
+- system.influxdb.database.stacklight
+- system.influxdb.database.ceilometer
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- 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-mcp-ocata-dvr-ceph-rgw
+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'
+    keepalived_prometheus_vip_interface: ens4
+    cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_local_address: ${_param:single_address}
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_node01_hostname: mon01
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_hostname: mon02
+    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
+    influxdb_port: 8086
+    influxdb_admin_password: password
+    influxdb_stacklight_password: lmapass
+    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
+    prometheus_influxdb_db: lma
+    prometheus_influxdb_username: lma
+    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+    remote_collector_telegraf_host: monitoring_remote_agent
+  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/ceph/common.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
index 1335900..c4607b6 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
@@ -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 rx pool=images"
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rwx 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"
\ No newline at end of file
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=vms, allow rwx pool=images, allow rwx pool=volumes"
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
index 45829b1..6b428ef 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
@@ -9,7 +9,7 @@
     primary_interface: ens4
     tenant_interface: ens5
     external_interface: ens6
-    interface_mtu: 9000
+    interface_mtu: 1500
     linux_system_codename: xenial
   linux:
     network: