diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/cephfs.yml b/classes/cluster/os-ha-ovs-ceph/ceph/cephfs.yml
new file mode 100644
index 0000000..d95f015
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/cephfs.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.ubuntu
+- cluster.os-ha-ovs-ceph
\ No newline at end of file
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/common.yml b/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
new file mode 100644
index 0000000..a213550
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
@@ -0,0 +1,28 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.ceph
+- cluster.os-ha-ovs-ceph.ceph
+- cluster.os-ha-ovs-ceph
+parameters:
+  ceph:
+    common:
+      public_network: 10.1.0.0/24
+      cluster_network: 10.16.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 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"
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/init.yml b/classes/cluster/os-ha-ovs-ceph/ceph/init.yml
new file mode 100644
index 0000000..2f0d2ec
--- /dev/null
+++ b/classes/cluster/os-ha-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/os-ha-ovs-ceph/ceph/mon.yml b/classes/cluster/os-ha-ovs-ceph/ceph/mon.yml
new file mode 100644
index 0000000..d24b118
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/mon.yml
@@ -0,0 +1,4 @@
+classes:
+- system.ceph.mon.cluster
+- system.ceph.mgr.cluster
+- cluster.os-ha-ovs-ceph.ceph.common
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/osd.yml b/classes/cluster/os-ha-ovs-ceph/ceph/osd.yml
new file mode 100644
index 0000000..d77b1d5
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/osd.yml
@@ -0,0 +1,17 @@
+classes:
+- system.ceph.osd.cluster
+- cluster.os-ha-ovs-ceph.ceph.common
+parameters:
+  ceph:
+    osd:
+      enabled: true
+      crush_parent: ${_param:ceph_crush_parent}
+      bluestore_block_db_size: 1007374182
+      bluestore_block_wal_size: 107374182
+      backend:
+        bluestore:
+          disks:
+            - dev: /dev/vdb
+              block_db: /dev/vdd
+            - dev: /dev/vdc
+              block_db: /dev/vdd
\ No newline at end of file
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/setup.yml b/classes/cluster/os-ha-ovs-ceph/ceph/setup.yml
new file mode 100644
index 0000000..df03169
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/setup.yml
@@ -0,0 +1,60 @@
+classes:
+- system.ceph.mon.cluster_init
+parameters:
+  ceph:
+    setup:
+      pool:
+        images:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          application: rbd
+          crush_rule: sata
+        volumes:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          application: rbd
+          crush_rule: sata
+        vms:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          application: rbd
+          crush_rule: sata
+        .rgw.root:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.control:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.meta:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.log:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.buckets.index:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          application: rgw
+          crush_rule: sata
+        default.rgw.buckets.data:
+          pg_num: 32
+          pgp_num: 32
+          type: replicated
+          application: rgw 
+          crush_rule: sata
diff --git a/classes/cluster/os-ha-ovs-ceph/infra/config.yml b/classes/cluster/os-ha-ovs-ceph/infra/config.yml
new file mode 100644
index 0000000..7b8bd25
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/infra/config.yml
@@ -0,0 +1,193 @@
+classes:
+- 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
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.core
+- system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
+- system.mysql.client
+- system.mysql.client.database.cinder
+- system.mysql.client.database.glance
+- system.mysql.client.database.heat
+- system.mysql.client.database.keystone
+- system.mysql.client.database.nova
+- system.mysql.client.database.nova_api
+- system.mysql.client.database.neutron
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.ceph_mon_cluster
+- cluster.os-ha-ovs-ceph.openstack.proxy
+- cluster.os-ha-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
+    reclass_config_master: ${_param:infra_config_deploy_address}
+    single_address: ${_param:infra_config_address}
+    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:
+        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:infra_config_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>>
+        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>>
+      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
+        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
\ No newline at end of file
diff --git a/classes/cluster/os-ha-ovs-ceph/infra/init.yml b/classes/cluster/os-ha-ovs-ceph/infra/init.yml
new file mode 100644
index 0000000..f7b7d18
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/infra/init.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    cluster_domain: os-ha-ovs-ceph.local
+    cluster_name: os-ha-ovs-ceph
+    infra_config_hostname: cfg01
+    infra_config_deploy_address: 192.168.10.90
+    infra_config_address: 172.16.10.90
+  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/os-ha-ovs-ceph/init.yml b/classes/cluster/os-ha-ovs-ceph/init.yml
new file mode 100644
index 0000000..b7e05f0
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/init.yml
@@ -0,0 +1,18 @@
+classes:
+- system.linux.network.dynamic_hosts
+- system.linux.system.single
+- cluster.os-ha-ovs-ceph.infra
+- cluster.os-ha-ovs-ceph.openstack
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.services
+- cluster.overrides
+parameters:
+  _param:
+    # 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
\ No newline at end of file
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml b/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml
new file mode 100644
index 0000000..8c5c79c
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml
@@ -0,0 +1,75 @@
+classes:
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.nova.compute.storage.ceph
+- system.ceph.common.cluster
+- cluster.os-ha-ovs-ceph.ceph.common
+- cluster.os-ha-ovs-ceph
+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"
+        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
+      concat_iface_files:
+      - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+        dst: '/etc/network/interfaces'
+      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
+        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}
+
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/control.yml b/classes/cluster/os-ha-ovs-ceph/openstack/control.yml
new file mode 100644
index 0000000..59bbc6f
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/control.yml
@@ -0,0 +1,152 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- 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.designate.server.cluster
+- system.designate.server.backend.bind
+- system.galera.server.cluster
+- system.galera.server.database.cinder
+- system.galera.server.database.designate
+- system.galera.server.database.glance
+- 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.cinder.control.backend.ceph
+- cluster.os-ha-ovs-ceph.ceph.common
+- system.ceph.common.cluster
+- cluster.os-ha-ovs-ceph.openstack.dashboard
+- cluster.os-ha-ovs-ceph
+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"
+  designate:
+    worker:
+      enabled: ${_param:designate_worker_enabled}
+    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
+  glance:
+    server:
+      storage:
+        engine: file
+      images: []
+      workers: 1
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+  heat:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+  neutron:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+  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
+  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"
+  cinder:
+    volume:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+    controller:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
new file mode 100644
index 0000000..ce7eae4
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.horizon.server.single
+- cluster.os-ha-ovs-ceph
+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/os-ha-ovs-ceph/openstack/gateway.yml b/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
new file mode 100644
index 0000000..fac3c05
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
@@ -0,0 +1,78 @@
+classes:
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.neutron.gateway.cluster
+- cluster.os-ha-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
+          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/os-ha-ovs-ceph/openstack/init.yml b/classes/cluster/os-ha-ovs-ceph/openstack/init.yml
new file mode 100644
index 0000000..e0f12e2
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/init.yml
@@ -0,0 +1,178 @@
+parameters:
+  _param:
+    openstack_proxy_hostname: cfg
+    openstack_proxy_address: ${_param:infra_config_address}
+    openstack_proxy_node01_hostname: cfg01
+    openstack_proxy_node01_address: ${_param:infra_config_address}
+    openstack_control_hostname: ctl
+    openstack_control_node01_hostname: ctl01
+    openstack_control_node02_hostname: ctl02
+    openstack_control_node03_hostname: ctl03
+    openstack_control_address: 172.16.10.254
+    openstack_control_node01_address: 172.16.10.91
+    openstack_control_node02_address: 172.16.10.92
+    openstack_control_node03_address: 172.16.10.93
+    openstack_gateway_hostname: gtw
+    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
+    openstack_gateway_node01_hostname: gtw01
+    openstack_gateway_node01_address: 172.16.10.94
+    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}
+
+    openstack_version: ocata
+    apt_mk_version: nightly
+    mcp_repo_version: 1.1
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: ${_param:openstack_proxy_address}
+    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: ${_param:openstack_control_address}
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
+    cluster_node01_address: ${_param:openstack_control_node01_address}
+    cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
+    cluster_node02_address: ${_param:openstack_control_node02_address}
+    cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
+    cluster_node03_address: ${_param:openstack_control_node03_address}
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    designate_service_host: ${_param:openstack_control_address}
+    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_worker_enabled: true
+    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
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    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_glance_password: workshop
+    mysql_heat_password: workshop
+    mysql_keystone_password: workshop
+    mysql_neutron_password: workshop
+    mysql_nova_password: workshop
+    mysql_designate_password: workshop
+    keystone_service_token: workshop
+    keystone_admin_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
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 2
+    # 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:
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - ${_param:openstack_proxy_hostname}
+          - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - ${_param:openstack_proxy_node01_hostname}
+          - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ${_param:openstack_control_hostname}
+          - ${_param:openstack_control_hostname}.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ${_param:openstack_control_node01_hostname}
+          - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ${_param:openstack_control_node02_hostname}
+          - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ${_param:openstack_control_node03_hostname}
+          - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+        gtw:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - ${_param:openstack_gateway_hostname}
+          - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - ${_param:openstack_gateway_hostname}
+          - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml b/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml
new file mode 100644
index 0000000..a34bc1b
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-ceph/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.salt.minion.cert.proxy
+- cluster.os-ha-ovs-ceph.openstack.dashboard
+- cluster.os-ha-ovs-ceph
+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-mcp-ocata-ovs-ceph/ceph/setup.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
index d33991d..484f11c 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
@@ -6,56 +6,56 @@
     setup:
       pool:
         images:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rbd
           crush_rule: sata
         volumes:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rbd
           crush_rule: sata
         vms:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rbd
           crush_rule: sata
         .rgw.root:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.control:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.meta:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.log:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.buckets.index:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.buckets.data:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw 
           crush_rule: sata
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
index ee079b6..c1afc30 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
@@ -25,7 +25,6 @@
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
-#- system.reclass.storage.system.ceph_mon_cluster
 - cluster.virtual-mcp-ocata-ovs-ceph.openstack.proxy
 - cluster.virtual-mcp-ocata-ovs-ceph.stacklight.proxy
 - cluster.virtual-mcp-ocata-ovs-ceph
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
index 766c55f..c210cb8 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
@@ -9,7 +9,8 @@
 - system.prometheus.exporters.libvirt
 - system.nova.compute.storage.ceph
 - system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-ovs-ceph
+- cluster.virtual-mcp-ocata-ovs-ceph.ceph.common
+- cluster.virtual-mcp-ocata-ovs-ceph.infra
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
index 7be99ab..b289988 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
@@ -1,6 +1,5 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.ceph
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
@@ -37,11 +36,12 @@
 - system.glance.control.storage.ceph
 - system.cinder.control.backend.ceph
 - system.ceph.common.cluster
+- cluster.virtual-mcp-ocata-ovs-ceph.ceph.common
 - system.cinder.control.cluster
 - system.cinder.control.notification.messagingv2
 - system.cinder.volume.single
 - system.cinder.volume.notification.messagingv2
-- cluster.virtual-mcp-ocata-ovs-ceph
+- cluster.virtual-mcp-ocata-ovs-ceph.infra
 parameters:
   _param:
     keepalived_vip_interface: ens4