diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/.env b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/.env
new file mode 100644
index 0000000..d2e169a
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf memcached collectd fluentd"
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml
new file mode 100644
index 0000000..6938a4a
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml
@@ -0,0 +1,194 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.master.api
+- system.reclass.storage.salt
+- 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.glare
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
+- system.reclass.storage.system.openstack_gateway_single
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+  _param:
+    linux_system_codename: xenial
+    openstack_linux_system_codename: trusty
+    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: ${_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}
+  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>>
+        openstack_dashboard:
+          expression: <<node_hostname>>__startswith__prx
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.dashboard
+          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: ${_param:openstack_linux_system_codename}
+        openstack_control_node02:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_control_node03:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_compute_node01:
+          params:
+            tenant_address: 10.1.0.105
+            external_address: 10.16.0.105
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_compute_node02:
+          params:
+            tenant_address: 10.1.0.106
+            external_address: 10.16.0.106
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_proxy_node01:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node02:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node03:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/init.yml
new file mode 100644
index 0000000..5c7c450
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/init.yml
@@ -0,0 +1,22 @@
+parameters:
+  _jenkins:
+    tests_enabled: false
+  _param:
+    cluster_domain: virtual-mcp-mitaka-dvr-trusty.local
+    cluster_name: virtual-mcp-mitaka-dvr-trusty
+    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/virtual-mcp-mitaka-dvr-trusty/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/init.yml
new file mode 100644
index 0000000..3593d3b
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/init.yml
@@ -0,0 +1,23 @@
+classes:
+- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- 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.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- 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.stacklight
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-mcp-mitaka-dvr-trusty.infra
+- cluster.virtual-mcp-mitaka-dvr-trusty.openstack
+- cluster.virtual-mcp-mitaka-dvr-trusty.stacklight
+- cluster.overrides
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
new file mode 100644
index 0000000..cf2722e
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
@@ -0,0 +1,60 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- 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
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+  _param:
+    primary_interface: eth1
+    tenant_interface: eth2
+    external_interface: eth3
+    interface_mtu: 1500
+  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
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        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
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
new file mode 100644
index 0000000..8f4a5ff
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
@@ -0,0 +1,161 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.storage.loopback
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- 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.cinder.control.backend.lvm
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- 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
+- cluster.virtual-mcp-mitaka-dvr-trusty
+
+parameters:
+  _param:
+    keepalived_vip_interface: eth1
+  linux:
+    system:
+      package:
+        python-msgpack:
+          version: latest
+    network:
+      interface:
+        eth1:
+          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:
+      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}"
+  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
+  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}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
new file mode 100644
index 0000000..177b577
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
@@ -0,0 +1,15 @@
+classes:
+- system.horizon.server.single
+- system.linux.system.repo.saltstack.trusty
+parameters:
+  _param:
+    horizon_site_branding: OpenStack Dashboard
+  linux:
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
new file mode 100644
index 0000000..2794889
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
@@ -0,0 +1,45 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.linux.network.interface.single_ovs_dvr
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+  _param:
+    primary_interface: eth1
+    tenant_interface: eth2
+    external_interface: eth3
+    interface_mtu: 9000
+    neutron_gateway_dvr: True
+    neutron_gateway_agent_mode: dvr_snat
+  neutron:
+    gateway:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        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
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml
new file mode 100644
index 0000000..67256b5
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml
@@ -0,0 +1,213 @@
+parameters:
+  _param:
+    openstack_proxy_hostname: prx
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
+    openstack_proxy_node01_hostname: prx01
+    openstack_proxy_node01_address: 172.16.10.121
+    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_compute_node01_hostname: cmp01
+    openstack_compute_node02_hostname: cmp02
+    openstack_compute_node01_address: 172.16.10.95
+    openstack_compute_node02_address: 172.16.10.96
+    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_log_appender: true
+    openstack_fluentd_handler_enabled: true
+
+    openstack_version: mitaka
+    apt_mk_version: nightly
+    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: ${_param:openstack_control_address}
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: ${_param:openstack_control_node01_address}
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: ${_param:openstack_control_node02_address}
+    cluster_node03_hostname: ctl03
+    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_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: false
+    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}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:cluster_vip_address}
+    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: 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
+    loopback_device_size: 20
+  linux:
+    network:
+      purge_hosts: true
+      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}
+        cmp01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ${_param:openstack_compute_node01_hostname}
+          - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+        cmp02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ${_param:openstack_compute_node02_hostname}
+          - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
new file mode 100644
index 0000000..1aaf437
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
@@ -0,0 +1,15 @@
+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.virtual-mcp-mitaka-dvr-trusty
+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-mitaka-dvr-trusty/stacklight/client.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/client.yml
new file mode 100644
index 0000000..47787ee
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/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-mitaka-dvr-trusty
+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-mitaka-dvr-trusty/stacklight/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/init.yml
new file mode 100644
index 0000000..f8bfdbe
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/init.yml
@@ -0,0 +1,45 @@
+parameters:
+  _param:
+    stacklight_monitor_hostname: mon
+    stacklight_monitor_node01_hostname: mon01
+    stacklight_monitor_node02_hostname: mon02
+    stacklight_monitor_node03_hostname: mon03
+    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_node01_address: 172.16.10.100
+    stacklight_monitor_node02_address: 172.16.10.101
+    stacklight_monitor_node03_address: 172.16.10.102
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    prometheus_control_address: ${_param:stacklight_monitor_address}
+    fluentd_elasticsearch_host: ${_param:stacklight_log_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:
+          - ${_param:stacklight_monitor_hostname}
+          - ${_param:stacklight_monitor_hostname}.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - ${_param:stacklight_monitor_node01_hostname}
+          - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - ${_param:stacklight_monitor_node02_hostname}
+          - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - ${_param:stacklight_monitor_node03_hostname}
+          - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/proxy.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/proxy.yml
new file mode 100644
index 0000000..e272ae5
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/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-mitaka-dvr-trusty
+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-mitaka-dvr-trusty/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
new file mode 100644
index 0000000..12748d8
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
@@ -0,0 +1,67 @@
+classes:
+- system.docker.host
+- system.linux.system.repo.influxdb
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.docker
+- 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.prometheus
+- 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.prometheus_global
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+  _param:
+    kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
+    keepalived_prometheus_vip_password: 'password'
+    keepalived_prometheus_vip_interface: eth1
+    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-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:5.0.3
+    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: prometheus
+    prometheus_influxdb_username: lma
+    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+    remote_collector_telegraf_host: monitoring_remote_agent
+  linux:
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
index 07eaa0f..977eea1 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-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.pkg
 - system.salt.master.api
@@ -24,11 +24,11 @@
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.openstack_proxy_single
 - system.reclass.storage.system.openstack_gateway_single
-- cluster.virtual-mcp-mitaka-dvr.openstack.proxy
-- cluster.virtual-mcp-mitaka-dvr.stacklight.proxy
 - cluster.virtual-mcp-mitaka-dvr
 parameters:
   _param:
+    linux_system_codename: xenial
+    openstack_linux_system_codename: xenial
     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"
@@ -140,7 +140,6 @@
           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>>
@@ -150,37 +149,46 @@
           - service.galera.master.cluster
           params:
             mysql_cluster_role: master
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_control_node02:
           classes:
           - service.galera.slave.cluster
           params:
             mysql_cluster_role: slave
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         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
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_compute_node01:
           params:
             tenant_address: 10.1.0.105
             external_address: 10.16.0.105
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_compute_node02:
           params:
             tenant_address: 10.1.0.106
             external_address: 10.16.0.106
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_gateway_node01:
           params:
             tenant_address: 10.1.0.110
             external_address: 10.16.0.110
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_proxy_node01:
-          classes:
-          - cluster.virtual-mcp-mitaka-dvr.openstack.proxy
           params:
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node02:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node03:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
index 9e41e85..d000096 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
@@ -1,5 +1,5 @@
 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.network.hosts
@@ -15,7 +15,6 @@
     tenant_interface: ens5
     external_interface: ens6
     interface_mtu: 1500
-    linux_system_codename: xenial
   neutron:
     compute:
       notification:
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
index 1fac8c1..20c3b3d 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
@@ -2,7 +2,7 @@
 - system.linux.system.lowmem
 - system.linux.storage.loopback
 - system.linux.system.repo.glusterfs
-- 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.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
index 743aa63..6b484c5 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
@@ -1,10 +1,6 @@
 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.virtual-mcp-mitaka-dvr
+- system.linux.system.repo.saltstack.xenial
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
index d7d93e8..0717926 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
@@ -1,5 +1,5 @@
 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.network.interface.single_ovs_dvr
@@ -13,7 +13,6 @@
     interface_mtu: 9000
     neutron_gateway_dvr: True
     neutron_gateway_agent_mode: dvr_snat
-    linux_system_codename: xenial
   neutron:
     gateway:
       notification:
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/.env b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/.env
new file mode 100644
index 0000000..49c1ca4
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/config.yml
new file mode 100644
index 0000000..89eba6c
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/config.yml
@@ -0,0 +1,202 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.master.api
+- 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.ceilometer
+- 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.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
+- system.reclass.storage.system.openstack_gateway_single
+- cluster.virtual-mcp-mitaka-ovs-trusty
+parameters:
+  _param:
+    linux_system_codename: xenial
+    openstack_linux_system_codename: trusty
+    reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+    reclass_data_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: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>>
+        openstack_dashboard:
+          expression: <<node_hostname>>__startswith__prx
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.dashboard
+          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: ${_param:openstack_linux_system_codename}
+        openstack_control_node02:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_control_node03:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_compute_node01:
+          params:
+            tenant_address: 10.1.0.105
+            external_address: 10.16.0.105
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_compute_node02:
+          params:
+            tenant_address: 10.1.0.106
+            external_address: 10.16.0.106
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp-mitaka-ovs-trusty.openstack.proxy
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node02:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node03:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/init.yml
new file mode 100644
index 0000000..1032ef5
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/init.yml
@@ -0,0 +1,22 @@
+parameters:
+  _jenkins:
+    tests_enabled: false
+  _param:
+    cluster_domain: virtual-mcp-mitaka-ovs-trusty.local
+    cluster_name: virtual-mcp-mitaka-ovs-trusty
+    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/virtual-mcp-mitaka-ovs-trusty/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/init.yml
new file mode 100644
index 0000000..4312c7d
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/init.yml
@@ -0,0 +1,23 @@
+classes:
+- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- 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.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.single
+- system.rsyslog.client.single
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.stacklight
+- system.openssh.server.team.mcp_qa
+- system.prometheus.collector
+- system.telegraf.agent
+- cluster.virtual-mcp-mitaka-ovs-trusty.infra
+- cluster.virtual-mcp-mitaka-ovs-trusty.openstack
+- cluster.virtual-mcp-mitaka-ovs-trusty.stacklight
+- cluster.overrides
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
new file mode 100644
index 0000000..761bea8
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
@@ -0,0 +1,69 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.heka.alarm.openstack_compute
+- system.prometheus.exporters.libvirt
+- cluster.virtual-mcp-mitaka-ovs-trusty
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 1500
+  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
+          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/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
new file mode 100644
index 0000000..7a50acd
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
@@ -0,0 +1,157 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.storage.loopback
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- 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.heka.ceilometer_collector.single
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.heat.server.cluster
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
+- system.galera.server.cluster
+- 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
+- cluster.virtual-mcp-mitaka-ovs-trusty
+
+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:
+      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}"
+  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
+  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}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
new file mode 100644
index 0000000..050c6cd
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
@@ -0,0 +1,15 @@
+classes:
+- system.horizon.server.single
+- system.linux.system.repo.saltstack.trusty
+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-mitaka-ovs-trusty/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
new file mode 100644
index 0000000..8bc9dfa
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
@@ -0,0 +1,80 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-mitaka-ovs-trusty
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+  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-mitaka-ovs-trusty/openstack/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/init.yml
new file mode 100644
index 0000000..e0cf2f1
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/init.yml
@@ -0,0 +1,207 @@
+parameters:
+  _param:
+    openstack_proxy_hostname: prx
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
+    openstack_proxy_node01_hostname: prx01
+    openstack_proxy_node01_address: 172.16.10.121
+    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_compute_node01_hostname: cmp01
+    openstack_compute_node02_hostname: cmp02
+    openstack_compute_node01_address: 172.16.10.95
+    openstack_compute_node02_address: 172.16.10.96
+    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: mitaka
+    apt_mk_version: nightly
+    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,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_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: false
+    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}
+    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_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
+    loopback_device_size: 20
+    ceilometer_influxdb_password: lmapass
+    openstack_log_appender: true
+    openstack_fluentd_handler_enabled: true
+  linux:
+    network:
+      purge_hosts: true
+      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}
+        cmp01:
+          address: ${_param:openstack_compute_node01_address}
+          names:
+          - ${_param:openstack_compute_node01_hostname}
+          - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+        cmp02:
+          address: ${_param:openstack_compute_node02_address}
+          names:
+          - ${_param:openstack_compute_node02_hostname}
+          - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
new file mode 100644
index 0000000..64f6c6a
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
@@ -0,0 +1,15 @@
+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.virtual-mcp-mitaka-ovs-trusty
+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-mitaka-ovs-trusty/stacklight/client.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/client.yml
new file mode 100644
index 0000000..4988908
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/client.yml
@@ -0,0 +1,21 @@
+classes:
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+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-mitaka-ovs-trusty/stacklight/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/init.yml
new file mode 100644
index 0000000..68c0524
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/init.yml
@@ -0,0 +1,42 @@
+parameters:
+  _param:
+    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_node01_address: 172.16.10.100
+    stacklight_monitor_node02_address: 172.16.10.101
+    stacklight_monitor_node03_address: 172.16.10.102
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    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
+    grafana_admin_password: admin
+    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:
+        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-mitaka-ovs-trusty/stacklight/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/proxy.yml
new file mode 100644
index 0000000..f09a263
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/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-mitaka-ovs-trusty
+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-mitaka-ovs-trusty/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
new file mode 100644
index 0000000..af9f983
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
@@ -0,0 +1,73 @@
+classes:
+- system.docker.host
+- system.linux.system.repo.influxdb
+- system.linux.system.repo.mcp.salt
+- 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
+- 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.prometheus
+- 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.prometheus_global
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-mitaka-ovs-trusty
+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-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
+    influxdb_stacklight_password: lmapass
+    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
+    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:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
index ca39912..37c5594 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/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.pkg
 - system.salt.master.api
@@ -32,11 +32,11 @@
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.openstack_proxy_single
 - system.reclass.storage.system.openstack_gateway_single
-- cluster.virtual-mcp-mitaka-ovs.openstack.proxy
-- cluster.virtual-mcp-mitaka-ovs.stacklight.proxy
 - cluster.virtual-mcp-mitaka-ovs
 parameters:
   _param:
+    linux_system_codename: xenial
+    openstack_linux_system_codename: xenial
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
     reclass_data_revision: master
     reclass_config_master: ${_param:infra_config_deploy_address}
@@ -146,7 +146,6 @@
           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>>
@@ -156,37 +155,48 @@
           - service.galera.master.cluster
           params:
             mysql_cluster_role: master
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_control_node02:
           classes:
           - service.galera.slave.cluster
           params:
             mysql_cluster_role: slave
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         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
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_compute_node01:
           params:
             tenant_address: 10.1.0.105
             external_address: 10.16.0.105
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_compute_node02:
           params:
             tenant_address: 10.1.0.106
             external_address: 10.16.0.106
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_gateway_node01:
           params:
             tenant_address: 10.1.0.110
             external_address: 10.16.0.110
+            linux_system_codename: ${_param:openstack_linux_system_codename}
         openstack_proxy_node01:
           classes:
           - cluster.virtual-mcp-mitaka-ovs.openstack.proxy
           params:
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node02:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
+        stacklight_server_node03:
+          params:
+            linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
index cbe05b2..fa6b011 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
@@ -1,5 +1,5 @@
 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.network.hosts
@@ -14,7 +14,6 @@
     tenant_interface: ens5
     external_interface: ens6
     interface_mtu: 1500
-    linux_system_codename: xenial
   nova:
     compute:
       vncproxy_url: http://${_param:cluster_vip_address}:6080
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
index c06ed3d..a734d72 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
@@ -2,7 +2,7 @@
 - system.linux.system.lowmem
 - system.linux.storage.loopback
 - system.linux.system.repo.glusterfs
-- 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.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
index 7e27212..6b484c5 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
@@ -1,10 +1,6 @@
 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.virtual-mcp-mitaka-ovs
+- system.linux.system.repo.saltstack.xenial
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
index fa035c4..03d6708 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
@@ -1,5 +1,5 @@
 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.neutron.gateway.cluster
@@ -10,7 +10,6 @@
     tenant_interface: ens5
     external_interface: ens6
     interface_mtu: 9000
-    linux_system_codename: xenial
   linux:
     network:
       bridge: openvswitch
diff --git a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml b/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
index 0678b6e..8e507df 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-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.pkg
 - system.salt.master.api
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
index 85ffec0..97c19d3 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
@@ -1,5 +1,5 @@
 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.network.hosts
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
index 0f67d74..7fe891b 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
@@ -2,7 +2,7 @@
 - system.linux.system.lowmem
 - system.linux.storage.loopback
 - system.linux.system.repo.glusterfs
-- 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.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
index af3f824..131595d 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.repo.ubuntu
-- 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.horizon.server.single
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
index fe6c97d..5322f4f 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
@@ -1,5 +1,5 @@
 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.network.interface.single_ovs_dvr
diff --git a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
index 79d311d..7267afb 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/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.pkg
 - system.salt.master.api
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
index 59b6bc3..1031c6f 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
@@ -1,5 +1,5 @@
 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.network.hosts
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
index 37c9611..28aa6d3 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
@@ -2,7 +2,7 @@
 - system.linux.system.lowmem
 - system.linux.storage.loopback
 - system.linux.system.repo.glusterfs
-- 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.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
index 04d1b0d..6aae392 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.repo.ubuntu
-- 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.horizon.server.single
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml
index a54d889..a6370f3 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml
@@ -1,5 +1,5 @@
 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.neutron.gateway.cluster