Added .gitreview

Change-Id: I2d40c493ee10ded61e416e79ceec8eb81ba64256
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..014c0c1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "classes/system"]
+	path = classes/system
+	url = https://gerrit.mcp.mirantis.net/salt-models/reclass-system
diff --git a/.gitreview b/.gitreview
index 891a0f5..d9a9864 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=mcp-ci-gerrit
+host=gerrit.mcp.mirantis.net
 port=29418
 project=salt-models/mcp-virtual-lab.git
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..2a36e96
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+test:
+	./scripts/test_reclass.sh
diff --git a/README.rst b/README.rst
new file mode 100755
index 0000000..3257e23
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,37 @@
+=======================
+MCP Virtual Labs Models
+=======================
+
+OpenStack Reclass models for Mk-based cloud deployments for QA.
+
+
+Available deployments
+=====================
+
+
+MCP 0.5 DVR (Openstack Mitaka)
+------------------------------
+
+* 1 config node
+* 3 control nodes
+* 1 compute node
+
+
+MCP 0.5 OVS (Openstack Mitaka)
+------------------------------
+
+* 1 config node
+* 3 control nodes
+* 1 compute node
+* 1 monitor node
+
+
+MCP 1.0 OpenContrail (Openstack Mitaka)
+---------------------------------------
+
+* 1 config node
+* 3 control nodes
+* 2 compute nodes
+* 1 monitor node
+* 1 meter node
+* 1 log node
diff --git a/classes/cluster/virtual-mcp05-dvr/infra/config.yml b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
new file mode 100644
index 0000000..464f3b6
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
@@ -0,0 +1,86 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.tcp_salt
+- system.openssh.client.lab
+- system.salt.master.api
+- system.salt.master.pkg
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.single
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.nova21
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.stacklight_server_cluster
+- cluster.virtual-mcp05-dvr.openstack.proxy
+- cluster.virtual-mcp05-dvr.stacklight.proxy
+- cluster.virtual-mcp05-dvr
+parameters:
+  _param:
+    reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/training
+    reclass_data_revision: master
+    salt_master_environment_repository: "https://github.com/tcpcloud"
+    salt_master_environment_revision: master
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+    reclass_config_master: 192.168.10.100
+    single_address: 172.16.10.100
+    salt_master_host: 127.0.0.1
+    salt_master_base_environment: prd
+    salt_minion_ca_host: ${linux:network:fqdn}
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_web:
+          proxy:
+            host: prx
+        nginx_proxy_openstack_api_heat_cfn:
+          enabled: false
+  reclass:
+    storage:
+      node:
+        openstack_control_node01:
+          classes:
+          - service.galera.master.cluster
+          params:
+            mysql_cluster_role: master
+        openstack_control_node02:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_control_node03:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_compute_node01:
+          params:
+            single_address: 172.16.10.105
+            tenant_address: 10.1.0.105
+            external_address: 10.16.0.105
+        openstack_compute_node02:
+          params:
+            single_address: 172.16.10.106
+            tenant_address: 10.1.0.106
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp05-dvr/infra/init.yml b/classes/cluster/virtual-mcp05-dvr/infra/init.yml
new file mode 100644
index 0000000..9140bd0
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/infra/init.yml
@@ -0,0 +1,14 @@
+parameters:
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg01
+          - cfg01.${_param:cluster_domain}
+        cfg:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg
+          - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-dvr/init.yml b/classes/cluster/virtual-mcp05-dvr/init.yml
new file mode 100644
index 0000000..4732fd1
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/init.yml
@@ -0,0 +1,40 @@
+classes:
+- system.linux.system.single
+- system.rsyslog.client.single
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-mcp05-dvr.infra
+- cluster.virtual-mcp05-dvr.openstack
+- cluster.virtual-mcp05-dvr.stacklight
+- cluster.virtual-mcp05-dvr.stacklight.client
+parameters:
+  _param:
+    cluster_domain: virtual-mcp05-dvr.local
+    cluster_name: virtual-mcp05-dvr
+    # infra service addresses
+    infra_config_address: 172.16.10.100
+    # openstack service addresses
+    openstack_database_address: 172.16.10.254
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
+    openstack_control_address: 172.16.10.254
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
+    openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node03_address}
+    openstack_message_queue_address: ${_param:openstack_control_address}
+    openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+    openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+    openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+    openstack_gateway_address: 172.16.10.110
+    # stacklight service addresses
+    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_node01_address: 172.16.10.107
+    stacklight_monitor_node02_address: 172.16.10.108
+    stacklight_monitor_node03_address: 172.16.10.109
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp05-dvr/openstack/compute.yml
new file mode 100644
index 0000000..417fa61
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/openstack/compute.yml
@@ -0,0 +1,34 @@
+classes:
+- system.linux.system.repo.mos92
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.linux.network.interface.single_ovs_dvr
+- cluster.virtual-mcp05-dvr
+- system.heka.alarm.openstack_compute
+parameters:
+  _param:
+    primary_interface: eth1
+    tenant_interface: eth2
+    external_interface: eth3
+    interface_mtu: 9000
+    linux_system_codename: trusty
+  neutron:
+    compute:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        driver: messagingv2
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+        notify_on:
+          state_change: vm_and_task_state
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/control.yml b/classes/cluster/virtual-mcp05-dvr/openstack/control.yml
new file mode 100644
index 0000000..3625984
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/openstack/control.yml
@@ -0,0 +1,98 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mos92
+- system.linux.system.repo.mos9_galera
+- system.linux.system.repo.tcp_extra
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.keystone.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.cluster
+- system.glance.control.cluster
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.heat.server.cluster
+- system.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
+- cluster.virtual-mcp05-dvr
+- system.heka.alarm.openstack_control
+parameters:
+  _param:
+    keepalived_vip_interface: eth1
+  linux:
+    system:
+      package:
+        python-msgpack:
+          version: latest
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
+  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}"
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp05-dvr/openstack/dashboard.yml
new file mode 100644
index 0000000..63dd2be
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo.tcp_mk20
+- system.horizon.server.single
+- cluster.virtual-mcp05-dvr
+parameters:
+  horizon:
+    server:
+      version: liberty
+  linux:
+    system:
+      repo:
+        tcpcloud_openstack:
+          source: deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty liberty
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp05-dvr/openstack/gateway.yml
new file mode 100644
index 0000000..0e56fef
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/openstack/gateway.yml
@@ -0,0 +1,20 @@
+classes:
+- system.linux.system.repo.mos92
+- system.linux.system.repo.tcp_extra
+- system.linux.network.interface.single_ovs_dvr
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp05-dvr
+parameters:
+  _param:
+    primary_interface: eth1
+    tenant_interface: eth2
+    external_interface: eth3
+    interface_mtu: 9000
+    neutron_gateway_dvr: True
+    neutron_gateway_agent_mode: dvr_snat
+    linux_system_codename: trusty
+  neutron:
+    gateway:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/init.yml b/classes/cluster/virtual-mcp05-dvr/openstack/init.yml
new file mode 100644
index 0000000..4bd5ae1
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/openstack/init.yml
@@ -0,0 +1,130 @@
+parameters:
+  _param:
+    openstack_version: mitaka
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    cluster_public_protocol: http
+    neutron_control_dvr: True
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: True
+    neutron_gateway_agent_mode: dvr_snat
+    neutron_compute_dvr: True
+    neutron_compute_agent_mode: dvr
+    neutron_compute_external_access: True
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: 172.16.10.108
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    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
+    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
+    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: 3
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+  linux:
+    network:
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml
new file mode 100644
index 0000000..3c03b07
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/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-mcp05-dvr
+parameters:
+  _param:
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp05-dvr/stacklight/client.yml
new file mode 100644
index 0000000..23536e3
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/stacklight/client.yml
@@ -0,0 +1,6 @@
+classes:
+- system.collectd.client.output.heka
+- system.heka.log_collector.single
+- system.heka.metric_collector.single
+- cluster.virtual-mcp05-dvr.stacklight
+- service.grafana.collector
diff --git a/classes/cluster/virtual-mcp05-dvr/stacklight/init.yml b/classes/cluster/virtual-mcp05-dvr/stacklight/init.yml
new file mode 100644
index 0000000..48bffdc
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/stacklight/init.yml
@@ -0,0 +1,48 @@
+parameters:
+  _param:
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    heka_aggregator_host: ${_param:stacklight_monitor_address}
+    aggregator_port: 5565
+    grafana_user: admin
+    grafana_password: password
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    elasticsearch_port: 9200
+    influxdb_stacklight_password: lmapass
+    influxdb_admin_password: password
+    influxdb_port: 8086
+    influxdb_database: lma
+    influxdb_user: lma
+    influxdb_password: lmapass
+    nagios_host: ${_param:stacklight_monitor_address}
+    nagios_status_port: 8001
+    nagios_username: nagiosadmin
+    nagios_password: secret
+    nagios_notification_smtp_server: 127.0.0.1
+    nagios_notification_from: 'nagios@localhost'
+    nagios_notification_email: 'root@localhost'
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-dvr/stacklight/proxy.yml b/classes/cluster/virtual-mcp05-dvr/stacklight/proxy.yml
new file mode 100644
index 0000000..0c3e4f8
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/stacklight/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.grafana_web
+- system.nginx.server.proxy.kibana_web
+- system.nginx.server.proxy.nagios_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp05-dvr
+parameters:
+  _param:
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp05-dvr/stacklight/server.yml
new file mode 100644
index 0000000..1dc1e58
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-dvr/stacklight/server.yml
@@ -0,0 +1,43 @@
+classes:
+- system.collectd.remote_client.cluster
+- system.linux.system.repo.influxdb
+- system.linux.system.repo.tcp_elastic
+- system.heka.remote_collector.cluster
+- system.heka.remote_collector.input.amqp
+- system.heka.aggregator.cluster
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.grafana.server.single
+- system.nagios.server.cluster
+- cluster.virtual-mcp05-dvr
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.grafana
+- service.haproxy.proxy.single
+- system.keepalived.cluster.instance.stacklight_monitor_vip
+parameters:
+  _param:
+    collectd_remote_collector_host: ${_param:stacklight_monitor_address}
+    heka_amqp_host: ${_param:openstack_control_address}
+    kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_password: 'password'
+    keepalived_stacklight_monitor_vip_interface: ens4
+    cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
+    cluster_node01_name: mon01
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_name: mon02
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_name: mon03
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/cluster/virtual-mcp05-ovs/infra/config.yml b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
new file mode 100644
index 0000000..2e5a1f5
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
@@ -0,0 +1,89 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.tcp_salt
+- system.openssh.client.lab
+- system.salt.master.api
+- system.salt.master.pkg
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.single
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.nova21
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.stacklight_server_cluster
+- cluster.virtual-mcp05-ovs.openstack.proxy
+- cluster.virtual-mcp05-ovs.stacklight.proxy
+- cluster.virtual-mcp05-ovs
+parameters:
+  _param:
+    reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/training
+    reclass_data_revision: master
+    salt_master_environment_repository: "https://github.com/tcpcloud"
+    salt_master_environment_revision: master
+    reclass_config_master: 192.168.10.100
+    single_address: 172.16.10.100
+    salt_master_host: 127.0.0.1
+    salt_master_base_environment: prd
+    salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_web:
+          proxy:
+            host: prx
+        nginx_proxy_openstack_api_heat_cfn:
+          enabled: false
+  reclass:
+    storage:
+      node:
+        openstack_control_node01:
+          classes:
+          - service.galera.master.cluster
+          params:
+            mysql_cluster_role: master
+        openstack_control_node02:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_control_node03:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_compute_node01:
+          params:
+            single_address: 172.16.10.105
+            tenant_address: 10.1.0.105
+            external_address: 10.16.0.105
+        openstack_compute_node02:
+          params:
+            single_address: 172.16.10.106
+            tenant_address: 10.1.0.106
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp05-ovs.openstack.proxy
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
diff --git a/classes/cluster/virtual-mcp05-ovs/infra/init.yml b/classes/cluster/virtual-mcp05-ovs/infra/init.yml
new file mode 100644
index 0000000..9140bd0
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/infra/init.yml
@@ -0,0 +1,14 @@
+parameters:
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg01
+          - cfg01.${_param:cluster_domain}
+        cfg:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg
+          - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-ovs/init.yml b/classes/cluster/virtual-mcp05-ovs/init.yml
new file mode 100644
index 0000000..27f0242
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/init.yml
@@ -0,0 +1,38 @@
+classes:
+- system.linux.system.single
+- cluster.virtual-mcp05-ovs.infra
+- cluster.virtual-mcp05-ovs.openstack
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- cluster.virtual-mcp05-ovs.stacklight
+- cluster.virtual-mcp05-ovs.stacklight.client
+- system.openssh.server.team.mcp_qa
+
+parameters:
+  _param:
+    cluster_domain: virtual-mcp05-ovs.local
+    cluster_name: virtual-mcp05-ovs
+    # infra service addresses
+    infra_config_address: 172.16.10.100
+    # openstack service addresses
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
+    openstack_control_address: 172.16.10.254
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
+    openstack_database_address: ${_param:openstack_control_address}
+    openstack_message_queue_address: ${_param:openstack_control_address}
+    openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+    openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+    openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+    openstack_gateway_address: 172.16.10.110
+    # stacklight service addresses
+    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_node01_address: 172.16.10.107
+    stacklight_monitor_node02_address: 172.16.10.108
+    stacklight_monitor_node03_address: 172.16.10.109
+
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp05-ovs/openstack/compute.yml
new file mode 100644
index 0000000..1a655d7
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/compute.yml
@@ -0,0 +1,28 @@
+classes:
+- system.linux.system.repo.mos92
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.linux.network.interface.single_ovs_dvr
+- system.heka.alarm.openstack_compute
+- cluster.virtual-mcp05-ovs
+parameters:
+  _param:
+    primary_interface: eth1
+    tenant_interface: eth2
+    external_interface: eth3
+    interface_mtu: 9000
+    linux_system_codename: trusty
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        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}
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/control.yml b/classes/cluster/virtual-mcp05-ovs/openstack/control.yml
new file mode 100644
index 0000000..521fcb9
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/control.yml
@@ -0,0 +1,98 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mos92
+- system.linux.system.repo.mos9_galera
+- system.linux.system.repo.tcp_extra
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- 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.alarm.openstack_control
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.heat.server.cluster
+- 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
+- cluster.virtual-mcp05-ovs
+parameters:
+  _param:
+    keepalived_vip_interface: eth1
+  linux:
+    system:
+      package:
+        python-msgpack:
+          version: latest
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
+  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}"
+  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}"
+  neutron:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  cinder:
+    volume:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+    controller:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp05-ovs/openstack/dashboard.yml
new file mode 100644
index 0000000..1a2e6b0
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/dashboard.yml
@@ -0,0 +1,30 @@
+classes:
+- system.linux.system.repo.tcp_mk20
+- service.horizon.server.single
+- cluster.virtual-mcp05-ovs
+parameters:
+  horizon:
+    server:
+      version: liberty
+      branding: "OpenStack Dashboard"
+      bind:
+        address: 0.0.0.0
+        port: 8078
+      plugin:
+        horizon_theme:
+          app: horizon_theme
+          theme_name: mirantis-theme
+          source:
+            engine: pkg
+            name: openstack-dashboard-mirantis-theme
+  linux:
+    system:
+      repo:
+        tcpcloud_openstack:
+          source: deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty liberty
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp05-ovs/openstack/gateway.yml
new file mode 100644
index 0000000..5b3dc93
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/gateway.yml
@@ -0,0 +1,13 @@
+classes:
+- system.linux.system.repo.mos92
+- system.linux.system.repo.tcp_extra
+- system.linux.network.interface.single_ovs_dvr
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp05-ovs
+parameters:
+  _param:
+    primary_interface: eth1
+    tenant_interface: eth2
+    external_interface: eth3
+    interface_mtu: 9000
+    linux_system_codename: trusty
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/init.yml b/classes/cluster/virtual-mcp05-ovs/openstack/init.yml
new file mode 100644
index 0000000..a6f550c
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/init.yml
@@ -0,0 +1,130 @@
+parameters:
+  _param:
+    openstack_version: mitaka
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    neutron_control_dvr: False
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: False
+    neutron_gateway_agent_mode: legacy
+    neutron_compute_dvr: False
+    neutron_compute_agent_mode: legacy
+    neutron_compute_external_access: False
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: 172.16.10.108
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    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
+    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
+    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: 3
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+  linux:
+    network:
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml
new file mode 100644
index 0000000..fdfd00e
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/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-mcp05-ovs
+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-mcp05-ovs/stacklight/client.yml b/classes/cluster/virtual-mcp05-ovs/stacklight/client.yml
new file mode 100644
index 0000000..9a353d6
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/stacklight/client.yml
@@ -0,0 +1,6 @@
+classes:
+- system.collectd.client.output.heka
+- system.heka.log_collector.single
+- system.heka.metric_collector.single
+- cluster.virtual-mcp05-ovs.stacklight
+- service.grafana.collector
diff --git a/classes/cluster/virtual-mcp05-ovs/stacklight/init.yml b/classes/cluster/virtual-mcp05-ovs/stacklight/init.yml
new file mode 100644
index 0000000..48bffdc
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/stacklight/init.yml
@@ -0,0 +1,48 @@
+parameters:
+  _param:
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    heka_aggregator_host: ${_param:stacklight_monitor_address}
+    aggregator_port: 5565
+    grafana_user: admin
+    grafana_password: password
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    elasticsearch_port: 9200
+    influxdb_stacklight_password: lmapass
+    influxdb_admin_password: password
+    influxdb_port: 8086
+    influxdb_database: lma
+    influxdb_user: lma
+    influxdb_password: lmapass
+    nagios_host: ${_param:stacklight_monitor_address}
+    nagios_status_port: 8001
+    nagios_username: nagiosadmin
+    nagios_password: secret
+    nagios_notification_smtp_server: 127.0.0.1
+    nagios_notification_from: 'nagios@localhost'
+    nagios_notification_email: 'root@localhost'
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-ovs/stacklight/proxy.yml b/classes/cluster/virtual-mcp05-ovs/stacklight/proxy.yml
new file mode 100644
index 0000000..39316e8
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/stacklight/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.grafana_web
+- system.nginx.server.proxy.kibana_web
+- system.nginx.server.proxy.nagios_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp05-ovs
+parameters:
+  _param:
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp05-ovs/stacklight/server.yml
new file mode 100644
index 0000000..943cc4e
--- /dev/null
+++ b/classes/cluster/virtual-mcp05-ovs/stacklight/server.yml
@@ -0,0 +1,43 @@
+classes:
+- system.collectd.remote_client.cluster
+- system.heka.remote_collector.cluster
+- system.linux.system.repo.influxdb
+- system.heka.remote_collector.input.amqp
+- system.heka.aggregator.cluster
+- system.linux.system.repo.tcp_elastic 
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.grafana.server.single
+- system.nagios.server.cluster
+- cluster.virtual-mcp05-ovs
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.grafana
+- service.haproxy.proxy.single
+- system.keepalived.cluster.instance.stacklight_monitor_vip
+parameters:
+  _param:
+    collectd_remote_collector_host: ${_param:stacklight_monitor_address}
+    heka_amqp_host: ${_param:openstack_control_address}
+    kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_password: 'password'
+    keepalived_stacklight_monitor_vip_interface: ens4
+    cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
+    cluster_node01_name: mon01
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_name: mon02
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_name: mon03
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/cluster/virtual-mcp10-contrail/infra/config.yml b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
new file mode 100755
index 0000000..832514d
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
@@ -0,0 +1,74 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.tcp_salt
+- system.openssh.client.lab
+- system.salt.master.api
+- system.salt.master.pkg
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.single
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.nova21
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_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.stacklight_server_cluster
+- cluster.virtual-mcp10-contrail.openstack.proxy
+- cluster.virtual-mcp10-contrail.stacklight.proxy
+- cluster.virtual-mcp10-contrail
+parameters:
+  _param:
+    reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/training"
+    reclass_data_revision: master
+    reclass_config_master: 192.168.10.100
+    single_address: 172.16.10.100
+    salt_master_host: 127.0.0.1
+    salt_master_base_environment: prd
+    salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_web:
+          proxy:
+            host: prx
+        nginx_proxy_openstack_api_heat_cfn:
+          enabled: false
+  reclass:
+    storage:
+      node:
+        openstack_control_node01:
+          classes:
+          - service.galera.master.cluster
+          params:
+            mysql_cluster_role: master
+        openstack_control_node02:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_control_node03:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp10-contrail.openstack.proxy
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
diff --git a/classes/cluster/virtual-mcp10-contrail/infra/init.yml b/classes/cluster/virtual-mcp10-contrail/infra/init.yml
new file mode 100755
index 0000000..9140bd0
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/infra/init.yml
@@ -0,0 +1,14 @@
+parameters:
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg01
+          - cfg01.${_param:cluster_domain}
+        cfg:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg
+          - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-contrail/init.yml b/classes/cluster/virtual-mcp10-contrail/init.yml
new file mode 100755
index 0000000..347f7f8
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/init.yml
@@ -0,0 +1,56 @@
+classes:
+- system.linux.system.single
+- system.rsyslog.client.single
+- system.openssh.server.team.lab
+- cluster.virtual-mcp10-contrail.infra
+- cluster.virtual-mcp10-contrail.openstack
+- cluster.virtual-mcp10-contrail.stacklight
+- cluster.virtual-mcp10-contrail.stacklight.client
+parameters:
+  _param:
+    cluster_domain: virtual-mcp10-contrail.local
+    cluster_name: virtual-mcp10-contrail
+    cluster_public_host: _
+
+    # infra service addresses
+    infra_config_address: 172.16.10.100
+
+    # openstack service addresses
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
+
+    openstack_control_address: 172.16.10.254
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
+
+    openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node02_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}
+
+    # opencontrail service addresses
+    opencontrail_analytics_address: ${_param:openstack_control_address}
+    opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
+    opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
+    opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
+
+    opencontrail_control_address: ${_param:openstack_control_address}
+    opencontrail_control_node01_address: ${_param:openstack_control_node01_address}
+    opencontrail_control_node02_address: ${_param:openstack_control_node02_address}
+    opencontrail_control_node03_address: ${_param:openstack_control_node03_address}
+
+    # stacklight service addresses
+    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_node01_address: 172.16.10.107
+    stacklight_monitor_node02_address: 172.16.10.108
+    stacklight_monitor_node03_address: 172.16.10.109
+
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
new file mode 100755
index 0000000..788b214
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
@@ -0,0 +1,60 @@
+classes:
+- system.linux.system.repo.mcp_contrail
+#- system.linux.system.repo.mos9
+- system.linux.system.repo.mcp10
+- system.nova.compute.cluster
+- system.opencontrail.compute.cluster
+- system.heka.alarm.openstack_compute
+- service.opencontrail.compute.cluster
+- cluster.virtual-mcp10-contrail
+parameters:
+  _param:
+    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}
+    opencontrail_compute_address: ${_param:single_address}
+    opencontrail_compute_gateway: 172.16.10.1
+    opencontrail_compute_iface: ens4
+    linux_system_codename: xenial
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: manual
+        vhost0:
+          enabled: true
+          type: eth
+          mtu: 1500
+          address: ${_param:single_address}
+          netmask: '255.255.255.0'
+          pre_up_cmds:
+          - /usr/lib/contrail/if-vhost0
+          use_interfaces:
+          - ens4
+  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
+  ceilometer:
+    agent:
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
new file mode 100755
index 0000000..5c067df
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
@@ -0,0 +1,120 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mcp_contrail
+- system.linux.system.repo.mos92
+- system.linux.system.repo.mos9_galera
+#- system.linux.system.repo.mos9
+#- system.linux.system.repo.mos9_latest
+- system.linux.system.repo.tcp_extra
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.keystone.server.cluster
+- system.keystone.server.storage.glusterfs
+- system.glance.control.cluster
+- system.glance.control.storage.glusterfs
+- system.nova.control.cluster
+- system.neutron.control.opencontrail.cluster
+- system.cinder.control.cluster
+- system.heat.server.cluster
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.opencontrail.control.cluster
+- system.heka.ceilometer_collector.single
+- system.galera.server.cluster
+- system.galera.server.database.aodh
+- system.galera.server.database.ceilometer
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.grafana
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- system.heka.alarm.openstack_control
+- cluster.virtual-mcp10-contrail
+parameters:
+  _param:
+    keepalived_vip_interface: eth1
+    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}
+  linux:
+    system:
+      package:
+        python-msgpack:
+          version: latest
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
+  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}"
+  nova:
+    controller:
+      networking: contrail
+      cpu_allocation: 54
+      bind:
+        private_address: ${_param:cluster_local_address}
+        public_address: ${_param:cluster_vip_address}
+        novncproxy_port: 6080
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      cache:
+        engine: memcached
+        prefix: CACHE_NOVA
+        members:
+        - host: 127.0.0.1
+          port: 11211
+      workers: 1
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  neutron:
+    server:
+      plugin: contrail
+      tunnel_type: vxlan
+      public_networks: []
+      contrail:
+        version: ${_param:opencontrail_version}
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  cinder:
+    volume:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+    controller:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
new file mode 100755
index 0000000..2c4a32e
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo.tcp_mk20
+- system.horizon.server.single
+- cluster.virtual-mcp10-contrail
+parameters:
+  horizon:
+    server:
+      version: liberty
+  linux:
+    system:
+      repo:
+        tcpcloud_openstack:
+          source: deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty liberty
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/init.yml b/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
new file mode 100755
index 0000000..ed8513a
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
@@ -0,0 +1,153 @@
+parameters:
+  _param:
+    openstack_version: mitaka
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_host: _
+    opencontrail_version: 3.0
+    opencontrail_compute_dns: 8.8.8.8
+    opencontrail_stats_password: contrail123
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    cluster_vip_address: ${_param:openstack_control_address}
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:openstack_control_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:openstack_control_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:openstack_control_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: ${_param:openstack_control_address}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:openstack_control_address}
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:openstack_control_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:openstack_control_address}
+    nova_vncproxy_url: http://${_param:openstack_control_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:opencontrail_control_address}
+    glusterfs_service_host: ${_param:openstack_control_address}
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+    mysql_aodh_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
+    keystone_service_token: workshop
+    keystone_admin_password: workshop
+    keystone_aodh_password: workshop
+    keystone_ceilometer_password: workshop
+    keystone_cinder_password: workshop
+    keystone_glance_password: workshop
+    keystone_heat_password: workshop
+    keystone_keystone_password: workshop
+    keystone_neutron_password: workshop
+    keystone_nova_password: workshop
+    ceilometer_secret_key: workshop
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:openstack_control_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 3
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
+  linux:
+    network:
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        msg:
+          address: ${_param:openstack_message_queue_address}
+          names:
+          - msg
+          - msg.${_param:cluster_domain}
+        msg01:
+          address: ${_param:openstack_message_queue_node01_address}
+          names:
+          - msg01
+          - msg01.${_param:cluster_domain}
+        msg02:
+          address: ${_param:openstack_message_queue_node02_address}
+          names:
+          - msg02
+          - msg02.${_param:cluster_domain}
+        msg03:
+          address: ${_param:openstack_message_queue_node03_address}
+          names:
+          - msg03
+          - msg03.${_param:cluster_domain}
+        dbs:
+          address: ${_param:openstack_database_address}
+          names:
+          - dbs
+          - dbs.${_param:cluster_domain}
+        dbs01:
+          address: ${_param:openstack_database_node01_address}
+          names:
+          - dbs01
+          - dbs01.${_param:cluster_domain}
+        dbs02:
+          address: ${_param:openstack_database_node02_address}
+          names:
+          - dbs02
+          - dbs02.${_param:cluster_domain}
+        dbs03:
+          address: ${_param:openstack_database_node03_address}
+          names:
+          - dbs03
+          - dbs03.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml b/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
new file mode 100755
index 0000000..9d81352
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
@@ -0,0 +1,17 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.opencontrail_web
+- 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-mcp10-contrail
+parameters:
+  _param:
+    cluster_vip_address: ${_param:openstack_proxy_address}
+    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-mcp10-contrail/stacklight/client.yml b/classes/cluster/virtual-mcp10-contrail/stacklight/client.yml
new file mode 100755
index 0000000..0fa9ded
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/stacklight/client.yml
@@ -0,0 +1,6 @@
+classes:
+- system.collectd.client.output.heka
+- system.heka.log_collector.single
+- system.heka.metric_collector.single
+- cluster.virtual-mcp10-contrail.stacklight
+- service.grafana.collector
diff --git a/classes/cluster/virtual-mcp10-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp10-contrail/stacklight/init.yml
new file mode 100755
index 0000000..a0ca702
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/stacklight/init.yml
@@ -0,0 +1,62 @@
+parameters:
+  _param:
+    cluster_local_address: ${_param:single_address}
+    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}
+
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    heka_aggregator_host: ${_param:stacklight_monitor_address}
+
+    aggregator_port: 5565
+
+    grafana_user: admin
+    grafana_password: password
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
+
+    elasticsearch_port: 9200
+
+    influxdb_stacklight_password: lmapass
+    influxdb_admin_password: password
+    influxdb_port: 8086
+    influxdb_database: lma
+    influxdb_user: lma
+    influxdb_password: lmapass
+
+    nagios_host: ${_param:stacklight_monitor_address}
+    nagios_status_port: 8001
+    nagios_username: nagiosadmin
+    nagios_password: secret
+    nagios_notification_smtp_server: 127.0.0.1
+    nagios_notification_from: 'nagios@localhost'
+    nagios_notification_email: 'root@localhost'
+
+    stacklight_environment: ${_param:cluster_domain}_prd
+    stacklight_notification_topic: stacklight_notifications
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-contrail/stacklight/proxy.yml b/classes/cluster/virtual-mcp10-contrail/stacklight/proxy.yml
new file mode 100755
index 0000000..1c4fe91
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/stacklight/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.grafana_web
+- system.nginx.server.proxy.kibana_web
+- system.nginx.server.proxy.nagios_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp10-contrail
+parameters:
+  _param:
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp10-contrail/stacklight/server.yml
new file mode 100755
index 0000000..721bdd3
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-contrail/stacklight/server.yml
@@ -0,0 +1,45 @@
+classes:
+- system.linux.system.repo.grafana
+- system.linux.system.repo.influxdb
+- system.linux.system.repo.tcp_elastic
+- system.collectd.remote_client.cluster
+- system.heka.remote_collector.cluster
+- system.heka.remote_collector.input.amqp
+- system.heka.aggregator.cluster
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.grafana.server.single
+- system.nagios.server.cluster
+#- system.influxdb.database.ceilometer
+- cluster.virtual-mcp10-contrail
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.grafana
+- service.haproxy.proxy.single
+- system.keepalived.cluster.instance.stacklight_monitor_vip
+parameters:
+  _param:
+    collectd_remote_collector_host: ${_param:stacklight_monitor_address}
+    heka_amqp_host: ${_param:openstack_message_queue_address}
+    kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_password: 'password'
+    keepalived_stacklight_monitor_vip_interface: ens4
+    cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
+    cluster_node01_name: mon01
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_name: mon02
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_name: mon03
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/config.yml b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
new file mode 100644
index 0000000..e2fe62e
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
@@ -0,0 +1,86 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.tcp_salt
+- system.openssh.client.lab
+- system.salt.master.api
+- system.salt.master.pkg
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.single
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.nova21
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.stacklight_server_cluster
+- cluster.virtual-mcp10-dvr.openstack.proxy
+- cluster.virtual-mcp10-dvr.stacklight.proxy
+- cluster.virtual-mcp10-dvr
+parameters:
+  _param:
+    reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/training
+    reclass_data_revision: master
+    salt_master_environment_repository: "https://github.com/tcpcloud"
+    salt_master_environment_revision: master
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+    reclass_config_master: 192.168.10.100
+    single_address: 172.16.10.100
+    salt_master_host: 127.0.0.1
+    salt_master_base_environment: prd
+    salt_minion_ca_host: ${linux:network:fqdn}
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_web:
+          proxy:
+            host: prx
+        nginx_proxy_openstack_api_heat_cfn:
+          enabled: false
+  reclass:
+    storage:
+      node:
+        openstack_control_node01:
+          classes:
+          - service.galera.master.cluster
+          params:
+            mysql_cluster_role: master
+        openstack_control_node02:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_control_node03:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_compute_node01:
+          params:
+            single_address: 172.16.10.105
+            tenant_address: 10.1.0.105
+            external_address: 10.16.0.105
+        openstack_compute_node02:
+          params:
+            single_address: 172.16.10.106
+            tenant_address: 10.1.0.106
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/init.yml b/classes/cluster/virtual-mcp10-dvr/infra/init.yml
new file mode 100644
index 0000000..9140bd0
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/infra/init.yml
@@ -0,0 +1,14 @@
+parameters:
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg01
+          - cfg01.${_param:cluster_domain}
+        cfg:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg
+          - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-dvr/init.yml b/classes/cluster/virtual-mcp10-dvr/init.yml
new file mode 100644
index 0000000..a4e8672
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/init.yml
@@ -0,0 +1,41 @@
+classes:
+- system.linux.system.single
+- system.rsyslog.client.single
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-mcp10-dvr.infra
+- cluster.virtual-mcp10-dvr.openstack
+- cluster.virtual-mcp10-dvr.stacklight
+- cluster.virtual-mcp10-dvr.stacklight.client
+parameters:
+  _param:
+    cluster_domain: virtual-mcp10-dvr.local
+    cluster_name: virtual-mcp10-dvr
+    # infra service addresses
+    infra_config_address: 172.16.10.100
+    # openstack service addresses
+    openstack_database_address: 172.16.10.254
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
+    openstack_control_address: 172.16.10.254
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
+    openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node03_address}
+    openstack_message_queue_address: ${_param:openstack_control_address}
+    openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+    openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+    openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+    openstack_gateway_address: 172.16.10.110
+    # stacklight service addresses
+    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_node01_address: 172.16.10.107
+    stacklight_monitor_node02_address: 172.16.10.108
+    stacklight_monitor_node03_address: 172.16.10.109
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
new file mode 100644
index 0000000..8f533f7
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
@@ -0,0 +1,34 @@
+classes:
+- system.linux.system.repo.mcp10
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.linux.network.interface.single_ovs_dvr
+- cluster.virtual-mcp10-dvr
+- system.heka.alarm.openstack_compute
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  neutron:
+    compute:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        driver: messagingv2
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+        notify_on:
+          state_change: vm_and_task_state
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
new file mode 100644
index 0000000..16b505d
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
@@ -0,0 +1,99 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mos92
+- system.linux.system.repo.mos9_galera
+- system.linux.system.repo.tcp_extra
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- 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.alarm.openstack_control
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.heat.server.cluster
+- 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
+- cluster.virtual-mcp10-dvr
+
+parameters:
+  _param:
+    keepalived_vip_interface: eth1
+  linux:
+    system:
+      package:
+        python-msgpack:
+          version: latest
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
+  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}"
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
new file mode 100644
index 0000000..d14746a
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo.tcp_mk20
+- system.horizon.server.single
+- cluster.virtual-mcp10-dvr
+parameters:
+  horizon:
+    server:
+      version: liberty
+  linux:
+    system:
+      repo:
+        tcpcloud_openstack:
+          source: deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty liberty
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
new file mode 100644
index 0000000..ce4ceba
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
@@ -0,0 +1,20 @@
+classes:
+- system.linux.system.repo.mcp10
+- system.linux.system.repo.tcp_extra
+- system.linux.network.interface.single_ovs_dvr
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp10-dvr
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    neutron_gateway_dvr: True
+    neutron_gateway_agent_mode: dvr_snat
+    linux_system_codename: xenial
+  neutron:
+    gateway:
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
new file mode 100644
index 0000000..4bd5ae1
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
@@ -0,0 +1,130 @@
+parameters:
+  _param:
+    openstack_version: mitaka
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    cluster_public_protocol: http
+    neutron_control_dvr: True
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: True
+    neutron_gateway_agent_mode: dvr_snat
+    neutron_compute_dvr: True
+    neutron_compute_agent_mode: dvr
+    neutron_compute_external_access: True
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: 172.16.10.108
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    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
+    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
+    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: 3
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+  linux:
+    network:
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
new file mode 100644
index 0000000..d0d51f2
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/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-mcp10-dvr
+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-mcp10-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp10-dvr/stacklight/client.yml
new file mode 100644
index 0000000..8708540
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/stacklight/client.yml
@@ -0,0 +1,6 @@
+classes:
+- system.collectd.client.output.heka
+- system.heka.log_collector.single
+- system.heka.metric_collector.single
+- cluster.virtual-mcp10-dvr.stacklight
+- service.grafana.collector
diff --git a/classes/cluster/virtual-mcp10-dvr/stacklight/init.yml b/classes/cluster/virtual-mcp10-dvr/stacklight/init.yml
new file mode 100644
index 0000000..48bffdc
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/stacklight/init.yml
@@ -0,0 +1,48 @@
+parameters:
+  _param:
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    heka_aggregator_host: ${_param:stacklight_monitor_address}
+    aggregator_port: 5565
+    grafana_user: admin
+    grafana_password: password
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    elasticsearch_port: 9200
+    influxdb_stacklight_password: lmapass
+    influxdb_admin_password: password
+    influxdb_port: 8086
+    influxdb_database: lma
+    influxdb_user: lma
+    influxdb_password: lmapass
+    nagios_host: ${_param:stacklight_monitor_address}
+    nagios_status_port: 8001
+    nagios_username: nagiosadmin
+    nagios_password: secret
+    nagios_notification_smtp_server: 127.0.0.1
+    nagios_notification_from: 'nagios@localhost'
+    nagios_notification_email: 'root@localhost'
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-dvr/stacklight/proxy.yml b/classes/cluster/virtual-mcp10-dvr/stacklight/proxy.yml
new file mode 100644
index 0000000..1078c1a
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/stacklight/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.grafana_web
+- system.nginx.server.proxy.kibana_web
+- system.nginx.server.proxy.nagios_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp10-dvr
+parameters:
+  _param:
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp10-dvr/stacklight/server.yml
new file mode 100644
index 0000000..f5a17ec
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-dvr/stacklight/server.yml
@@ -0,0 +1,43 @@
+classes:
+- system.collectd.remote_client.cluster
+- system.linux.system.repo.influxdb
+- system.linux.system.repo.tcp_elastic
+- system.heka.remote_collector.cluster
+- system.heka.remote_collector.input.amqp
+- system.heka.aggregator.cluster
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.grafana.server.single
+- system.nagios.server.cluster
+- cluster.virtual-mcp10-dvr
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.grafana
+- service.haproxy.proxy.single
+- system.keepalived.cluster.instance.stacklight_monitor_vip
+parameters:
+  _param:
+    collectd_remote_collector_host: ${_param:stacklight_monitor_address}
+    heka_amqp_host: ${_param:openstack_control_address}
+    kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_password: 'password'
+    keepalived_stacklight_monitor_vip_interface: ens4
+    cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
+    cluster_node01_name: mon01
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_name: mon02
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_name: mon03
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/config.yml b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
new file mode 100644
index 0000000..3d0c87e
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
@@ -0,0 +1,89 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.tcp_salt
+- system.openssh.client.lab
+- system.salt.master.api
+- system.salt.master.pkg
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.single
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.nova21
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.stacklight_server_cluster
+- cluster.virtual-mcp10-ovs.openstack.proxy
+- cluster.virtual-mcp10-ovs.stacklight.proxy
+- cluster.virtual-mcp10-ovs
+parameters:
+  _param:
+    reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/training
+    reclass_data_revision: master
+    salt_master_environment_repository: "https://github.com/tcpcloud"
+    salt_master_environment_revision: master
+    reclass_config_master: 192.168.10.100
+    single_address: 172.16.10.100
+    salt_master_host: 127.0.0.1
+    salt_master_base_environment: prd
+    salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_web:
+          proxy:
+            host: prx
+        nginx_proxy_openstack_api_heat_cfn:
+          enabled: false
+  reclass:
+    storage:
+      node:
+        openstack_control_node01:
+          classes:
+          - service.galera.master.cluster
+          params:
+            mysql_cluster_role: master
+        openstack_control_node02:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_control_node03:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+        openstack_compute_node01:
+          params:
+            single_address: 172.16.10.105
+            tenant_address: 10.1.0.105
+            external_address: 10.16.0.105
+        openstack_compute_node02:
+          params:
+            single_address: 172.16.10.106
+            tenant_address: 10.1.0.106
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp10-ovs.openstack.proxy
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/init.yml b/classes/cluster/virtual-mcp10-ovs/infra/init.yml
new file mode 100644
index 0000000..9140bd0
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/infra/init.yml
@@ -0,0 +1,14 @@
+parameters:
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg01
+          - cfg01.${_param:cluster_domain}
+        cfg:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg
+          - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-ovs/init.yml b/classes/cluster/virtual-mcp10-ovs/init.yml
new file mode 100644
index 0000000..4da06e4
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/init.yml
@@ -0,0 +1,38 @@
+classes:
+- system.linux.system.single
+- cluster.virtual-mcp10-ovs.infra
+- cluster.virtual-mcp10-ovs.openstack
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-mcp10-ovs.stacklight
+- cluster.virtual-mcp10-ovs.stacklight.client
+
+parameters:
+  _param:
+    cluster_domain: virtual-mcp10-ovs.local
+    cluster_name: virtual-mcp10-ovs
+    # infra service addresses
+    infra_config_address: 172.16.10.100
+    # openstack service addresses
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
+    openstack_control_address: 172.16.10.254
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
+    openstack_database_address: ${_param:openstack_control_address}
+    openstack_message_queue_address: ${_param:openstack_control_address}
+    openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+    openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+    openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+    # stacklight service addresses
+    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_node01_address: 172.16.10.107
+    stacklight_monitor_node02_address: 172.16.10.108
+    stacklight_monitor_node03_address: 172.16.10.109
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
new file mode 100644
index 0000000..e1ddb2d
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
@@ -0,0 +1,27 @@
+classes:
+- system.linux.system.repo.mcp10
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.linux.network.interface.single_ovs_dvr
+- system.heka.alarm.openstack_compute
+- cluster.virtual-mcp10-ovs
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: eth2
+    external_interface: eth3
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        driver: messagingv2
+        topics: "notifications,${_param:stacklight_notification_topic}"
+        notify_on:
+          state_change: vm_and_task_state
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/control.yml b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
new file mode 100644
index 0000000..cc7f178
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
@@ -0,0 +1,98 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mos92
+- system.linux.system.repo.mos9_galera
+- system.linux.system.repo.tcp_extra
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- 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.alarm.openstack_control
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.heat.server.cluster
+- 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
+- cluster.virtual-mcp10-ovs
+parameters:
+  _param:
+    keepalived_vip_interface: eth1
+  linux:
+    system:
+      package:
+        python-msgpack:
+          version: latest
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
+  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}"
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
new file mode 100644
index 0000000..d090842
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
@@ -0,0 +1,30 @@
+classes:
+- system.linux.system.repo.tcp_mk20
+- service.horizon.server.single
+- cluster.virtual-mcp10-ovs
+parameters:
+  horizon:
+    server:
+      version: liberty
+      branding: "OpenStack Dashboard"
+      bind:
+        address: 0.0.0.0
+        port: 8078
+      plugin:
+        horizon_theme:
+          app: horizon_theme
+          theme_name: mirantis-theme
+          source:
+            engine: pkg
+            name: openstack-dashboard-mirantis-theme
+  linux:
+    system:
+      repo:
+        tcpcloud_openstack:
+          source: deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty liberty
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
new file mode 100644
index 0000000..b40d746
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
@@ -0,0 +1,13 @@
+classes:
+- system.linux.system.repo.mcp10
+- system.linux.system.repo.tcp_extra
+- system.linux.network.interface.single_ovs_dvr
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp10-ovs
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: eth2
+    external_interface: eth3
+    interface_mtu: 9000
+    linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/init.yml b/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
new file mode 100644
index 0000000..a6f550c
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
@@ -0,0 +1,130 @@
+parameters:
+  _param:
+    openstack_version: mitaka
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    neutron_control_dvr: False
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: False
+    neutron_gateway_agent_mode: legacy
+    neutron_compute_dvr: False
+    neutron_compute_agent_mode: legacy
+    neutron_compute_external_access: False
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: 172.16.10.254
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ctl01
+    cluster_node01_address: 172.16.10.101
+    cluster_node02_hostname: ctl02
+    cluster_node02_address: 172.16.10.102
+    cluster_node03_hostname: ctl03
+    cluster_node03_address: 172.16.10.103
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: 172.16.10.108
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    neutron_version: ${_param:openstack_version}
+    neutron_service_host: ${_param:cluster_vip_address}
+    glusterfs_service_host: ${_param:cluster_vip_address}
+    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
+    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
+    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: 3
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+  linux:
+    network:
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - prx
+          - prx.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - prx01
+          - prx01.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ctl
+          - ctl.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ctl01
+          - ctl01.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ctl02
+          - ctl02.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ctl03
+          - ctl03.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - gtw01
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
new file mode 100644
index 0000000..855ba7c
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/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-mcp10-ovs
+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-mcp10-ovs/stacklight/client.yml b/classes/cluster/virtual-mcp10-ovs/stacklight/client.yml
new file mode 100644
index 0000000..e69bb7a
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/stacklight/client.yml
@@ -0,0 +1,6 @@
+classes:
+- system.collectd.client.output.heka
+- system.heka.log_collector.single
+- system.heka.metric_collector.single
+- cluster.virtual-mcp10-ovs.stacklight
+- service.grafana.collector
diff --git a/classes/cluster/virtual-mcp10-ovs/stacklight/init.yml b/classes/cluster/virtual-mcp10-ovs/stacklight/init.yml
new file mode 100644
index 0000000..48bffdc
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/stacklight/init.yml
@@ -0,0 +1,48 @@
+parameters:
+  _param:
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    heka_aggregator_host: ${_param:stacklight_monitor_address}
+    aggregator_port: 5565
+    grafana_user: admin
+    grafana_password: password
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
+    elasticsearch_port: 9200
+    influxdb_stacklight_password: lmapass
+    influxdb_admin_password: password
+    influxdb_port: 8086
+    influxdb_database: lma
+    influxdb_user: lma
+    influxdb_password: lmapass
+    nagios_host: ${_param:stacklight_monitor_address}
+    nagios_status_port: 8001
+    nagios_username: nagiosadmin
+    nagios_password: secret
+    nagios_notification_smtp_server: 127.0.0.1
+    nagios_notification_from: 'nagios@localhost'
+    nagios_notification_email: 'root@localhost'
+    stacklight_environment: ${_param:cluster_domain}
+    stacklight_notification_topic: stacklight_notifications
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:stacklight_monitor_address}
+          names:
+          - mon
+          - mon.${_param:cluster_domain}
+        mon01:
+          address: ${_param:stacklight_monitor_node01_address}
+          names:
+          - mon01
+          - mon01.${_param:cluster_domain}
+        mon02:
+          address: ${_param:stacklight_monitor_node02_address}
+          names:
+          - mon02
+          - mon02.${_param:cluster_domain}
+        mon03:
+          address: ${_param:stacklight_monitor_node03_address}
+          names:
+          - mon03
+          - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-ovs/stacklight/proxy.yml b/classes/cluster/virtual-mcp10-ovs/stacklight/proxy.yml
new file mode 100644
index 0000000..3767a81
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/stacklight/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.grafana_web
+- system.nginx.server.proxy.kibana_web
+- system.nginx.server.proxy.nagios_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp10-ovs
+parameters:
+  _param:
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp10-ovs/stacklight/server.yml
new file mode 100644
index 0000000..4a8f12b
--- /dev/null
+++ b/classes/cluster/virtual-mcp10-ovs/stacklight/server.yml
@@ -0,0 +1,43 @@
+classes:
+- system.collectd.remote_client.cluster
+- system.heka.remote_collector.cluster
+- system.linux.system.repo.influxdb
+- system.heka.remote_collector.input.amqp
+- system.heka.aggregator.cluster
+- system.linux.system.repo.tcp_elastic 
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.grafana.server.single
+- system.nagios.server.cluster
+- cluster.virtual-mcp10-ovs
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.grafana
+- service.haproxy.proxy.single
+- system.keepalived.cluster.instance.stacklight_monitor_vip
+parameters:
+  _param:
+    collectd_remote_collector_host: ${_param:stacklight_monitor_address}
+    heka_amqp_host: ${_param:openstack_control_address}
+    kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
+    keepalived_stacklight_monitor_vip_password: 'password'
+    keepalived_stacklight_monitor_vip_interface: ens4
+    cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
+    cluster_node01_name: mon01
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_name: mon02
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_name: mon03
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: dhcp
diff --git a/classes/system b/classes/system
new file mode 160000
index 0000000..baf830e
--- /dev/null
+++ b/classes/system
@@ -0,0 +1 @@
+Subproject commit baf830eb4645af839ea9ccbe9eff1a91465f9a5e
diff --git a/nodes/cfg01.virtual-mcp05-dvr.local.yml b/nodes/cfg01.virtual-mcp05-dvr.local.yml
new file mode 100755
index 0000000..5491179
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp05-dvr.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp05-dvr.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp05-dvr.local
diff --git a/nodes/cfg01.virtual-mcp05-ovs.local.yml b/nodes/cfg01.virtual-mcp05-ovs.local.yml
new file mode 100755
index 0000000..5b500f2
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp05-ovs.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp05-ovs.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp05-ovs.local
diff --git a/nodes/cfg01.virtual-mcp10-contrail.local.yml b/nodes/cfg01.virtual-mcp10-contrail.local.yml
new file mode 100755
index 0000000..fb2c57c
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp10-contrail.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp10-contrail.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp10-contrail.local
diff --git a/nodes/cfg01.virtual-mcp10-dvr.local.yml b/nodes/cfg01.virtual-mcp10-dvr.local.yml
new file mode 100755
index 0000000..14cef32
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp10-dvr.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp10-dvr.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp10-dvr.local
diff --git a/nodes/cfg01.virtual-mcp10-ovs.local.yml b/nodes/cfg01.virtual-mcp10-ovs.local.yml
new file mode 100755
index 0000000..d38969f
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp10-ovs.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp10-ovs.infra.config
+parameters:
+  _param:
+    linux_system_codename: xenial
+    reclass_data_revision: master
+  linux:
+    system:
+      name: cfg01
+      domain: virtual-mcp10-ovs.local
diff --git a/scripts/bootstrap_all.sh b/scripts/bootstrap_all.sh
new file mode 100755
index 0000000..7d9d3ad
--- /dev/null
+++ b/scripts/bootstrap_all.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -x
+
+CWD="$(dirname "$(readlink -f "$0")")"
+
+"$CWD"/fuel_config_verify.sh
+"$CWD"/fuel_infra_install.sh
+"$CWD"/openstack_infra_install.sh
+"$CWD"/openstack_control_install.sh
+"$CWD"/opencontrail_control_install.sh
+"$CWD"/stacklight_infra_install.sh
+"$CWD"/openstack_compute_install.sh
+"$CWD"/stacklight_monitor_install.sh
diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh
new file mode 100755
index 0000000..66c4b88
--- /dev/null
+++ b/scripts/common_functions.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Function used to return list of node names according
+# to given string parameter match criteria
+function get_nodes_names {
+	# Enforce 1st parameter availability
+	if [ -z "$1" ]; then
+		match="[0-9]"
+	else
+		match="$1"
+	fi
+	salt-call pillar.get linux:network:host --out key | sed 's/:.*//' | grep "$match"
+}
+
+# Function used to wait for node availability
+# (aka answering to salt pings)
+# 1st parameter (mandatory) is number of nodes to wait for
+# 2nd parameter (optional) is nodes names to wait for
+#    (* = all nodes is default)
+function wait_for {
+	# Enforce 1st parameter availability
+	if [ -z "$1" ]; then
+		echo "wait_for function requires at least 1 parameter"
+		return 1
+	fi
+	if [ "$1" -lt "1" ]; then
+		echo "wait_for function requires 1st parameter to be number greater than 0 ($1 invalid)"
+		return 1
+	fi
+	wanted=$1
+	nodes=${2:-"*"}
+	# Default max waiting time is 5mn
+	MAX_WAIT=${MAX_WAIT:-300}
+	while true; do
+        nb_nodes=$(salt "$nodes" test.ping --out txt | grep -c True)
+		if [ -n "$nb_nodes" ] && [ "$nb_nodes" -eq "$wanted" ]; then
+			echo "All nodes are now answering to salt pings"
+			break
+		fi
+		MAX_WAIT=$(( MAX_WAIT - 15 ))
+		if [ $MAX_WAIT -le 0 ]; then
+			echo "Only $nb_nodes answering to salt pings out of $wanted after maximum timeout"
+			return 2
+		fi
+		echo -n "Only $nb_nodes answering to salt pings out of $wanted. Waiting a bit longer ..."
+		sleep 15
+		echo
+	done
+	return 0
+}
diff --git a/scripts/fuel_config_verify.sh b/scripts/fuel_config_verify.sh
new file mode 100755
index 0000000..dd1d159
--- /dev/null
+++ b/scripts/fuel_config_verify.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+CWD="$(dirname "$(readlink -f "$0")")"
+
+# Import common functions
+COMMONS=$CWD/common_functions.sh
+if [ ! -f "$COMMONS" ]; then
+	echo "File $COMMONS does not exist"
+	exit 1
+fi
+. "$COMMONS"
+
+# Verify that Salt master is correctly bootstrapped
+salt-key
+reclass-salt --top
+
+# Verify that Salt minions are responding and have the same version as the master
+salt-call --version
+salt '*' test.version
diff --git a/scripts/fuel_infra_install.sh b/scripts/fuel_infra_install.sh
new file mode 100755
index 0000000..6166440
--- /dev/null
+++ b/scripts/fuel_infra_install.sh
@@ -0,0 +1,16 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+# Refresh salt master config
+salt -C 'I@salt:master' state.sls salt.master,reclass
+
+# Refresh minion's pillar data
+salt '*' saltutil.refresh_pillar
+
+# Sync all salt resources
+salt '*' saltutil.sync_all
+
+sleep 5
+
+# Bootstrap all nodes
+salt "*" state.sls linux,openssh,salt.minion,ntp,rsyslog
diff --git a/scripts/opencontrail_control_install.sh b/scripts/opencontrail_control_install.sh
new file mode 100755
index 0000000..eca1773
--- /dev/null
+++ b/scripts/opencontrail_control_install.sh
@@ -0,0 +1,31 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+CWD="$(dirname "$(readlink -f "$0")")"
+
+# Import common functions
+COMMONS=$CWD/common_functions.sh
+if [ ! -f "$COMMONS" ]; then
+	echo "File $COMMONS does not exist"
+	exit 1
+fi
+. "$COMMONS"
+
+# Install opencontrail database services
+salt -C 'I@opencontrail:database' state.sls opencontrail.database -b 1
+# Install opencontrail control services
+salt -C 'I@opencontrail:control' state.sls opencontrail -b 1
+
+# Provision opencontrail control services
+hosts=($(get_nodes_names "ctl[0-9]"))
+vip=$(salt-call pillar.get _param:cluster_vip_address | grep '^ ' | sed -e 's/  *//')
+nb=$(( ${#hosts[@]} - 1 ))
+for i in $(seq 0 $nb); do
+	h=${hosts[$i]}
+	ip=$(salt-call pillar.get linux:network:host:"${h}":address | grep '^ ' | sed -e 's/  *//')
+	salt -C 'I@opencontrail:control:id:1' cmd.run "/usr/share/contrail-utils/provision_control.py --api_server_ip $vip --api_server_port 8082 --host_name $h --host_ip $ip --router_asn 64512 --admin_password workshop --admin_user admin --admin_tenant_name admin --oper add"
+done
+
+# Test opencontrail
+salt -C 'I@opencontrail:control' cmd.run "contrail-status"
+salt -C 'I@keystone:server' cmd.run ". /root/keystonerc; neutron net-list; nova net-list"
diff --git a/scripts/openstack_compute_install.sh b/scripts/openstack_compute_install.sh
new file mode 100755
index 0000000..64597ca
--- /dev/null
+++ b/scripts/openstack_compute_install.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+CWD="$(dirname "$(readlink -f "$0")")"
+
+# Import common functions
+COMMONS=$CWD/common_functions.sh
+if [ ! -f "$COMMONS" ]; then
+	echo "File $COMMONS does not exist"
+	exit 1
+fi
+. "$COMMONS"
+
+# Configure compute nodes
+salt "cmp*" state.apply
+salt "cmp*" state.apply
+
+# Provision opencontrail virtual routers
+hosts=($(salt-call pillar.get linux:network:host | egrep 'cmp0.*:' | sed -e 's/  *//' -e 's/://'))
+vip=$(salt-call pillar.get _param:cluster_vip_address | grep '^ ' | sed -e 's/  *//')
+nb=$(( ${#hosts[@]} - 1 ))
+for i in $(seq 0 $nb); do
+	h=${hosts[$i]}
+	ip=$(salt-call pillar.get linux:network:host:"${h}":address | grep '^ ' | sed -e 's/  *//')
+	salt -C 'I@opencontrail:control:id:1' cmd.run "/usr/share/contrail-utils/provision_vrouter.py --host_name $h --host_ip $ip --api_server_ip $vip --oper add --admin_user admin --admin_password workshop --admin_tenant_name admin"
+done
+
+# Reboot compute nodes
+salt "cmp*" system.reboot
+
+# Wait for all compute nodes in current deployment to be available
+wait_for "$(get_nodes_names "cmp[0-9]" | wc -l)" "cmp*"
diff --git a/scripts/openstack_control_install.sh b/scripts/openstack_control_install.sh
new file mode 100755
index 0000000..8291844
--- /dev/null
+++ b/scripts/openstack_control_install.sh
@@ -0,0 +1,45 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+# setup keystone service
+salt -C 'I@keystone:server' state.sls keystone.server -b 1
+# populate keystone services/tenants/admins
+salt -C 'I@keystone:client' state.sls keystone.client
+salt -C 'I@keystone:server' cmd.run ". /root/keystonerc; keystone service-list"
+
+# Install glance and ensure glusterfs clusters
+salt -C 'I@glance:server' state.sls glance -b 1
+salt -C 'I@glance:server' state.sls glusterfs.client
+# Update fernet tokens before doing request on keystone server. Otherwise
+# you will get an error like:
+# "No encryption keys found; run keystone-manage fernet_setup to bootstrap one"
+salt -C 'I@keystone:server' state.sls keystone.server
+salt -C 'I@keystone:server' cmd.run ". /root/keystonerc; glance image-list"
+
+# Install nova service
+salt -C 'I@nova:controller' state.sls nova -b 1
+salt -C 'I@keystone:server' cmd.run ". /root/keystonerc; nova service-list"
+
+# Install cinder service
+salt -C 'I@cinder:controller' state.sls cinder -b 1
+salt -C 'I@keystone:server' cmd.run ". /root/keystonerc; cinder list"
+
+# Install neutron service
+salt -C 'I@neutron:server' state.sls neutron -b 1
+salt -C 'I@neutron:gateway' state.sls neutron
+salt -C 'I@keystone:server' cmd.run ". /root/keystonerc; neutron agent-list"
+
+# Install heat service
+salt -C 'I@heat:server' state.sls heat -b 1
+salt -C 'I@keystone:server' cmd.run ". /root/keystonerc; heat resource-type-list"
+
+# Install horizon dashboard
+salt -C 'I@horizon:server' state.sls horizon
+salt -C 'I@nginx:server' state.sls nginx
+
+# Install ceilometer services
+salt -C 'I@ceilometer:server' state.sls ceilometer -b 1
+salt -C 'I@heka:ceilometer_collector:enabled:True' state.sls heka.ceilometer_collector
+
+# Install aodh services
+salt -C 'I@aodh:server' state.sls aodh -b 1
diff --git a/scripts/openstack_infra_install.sh b/scripts/openstack_infra_install.sh
new file mode 100755
index 0000000..ca56361
--- /dev/null
+++ b/scripts/openstack_infra_install.sh
@@ -0,0 +1,33 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+# Install keepaliveds
+salt -C 'I@keepalived:cluster' state.sls keepalived -b 1
+# Check the VIPs
+salt -C 'I@keepalived:cluster' cmd.run "ip a | grep 172.16.10.2"
+
+# Install gluster
+salt -C 'I@glusterfs:server' state.sls glusterfs.server.service
+salt -C 'I@glusterfs:server' state.sls glusterfs.server.setup -b 1
+# Check the gluster status
+salt -C 'I@glusterfs:server' cmd.run "gluster peer status; gluster volume status" -b 1
+
+# Install rabbitmq
+salt -C 'I@rabbitmq:server' state.sls rabbitmq
+# Check the rabbitmq status
+salt -C 'I@rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
+
+# Install galera
+salt -C 'I@galera:master' state.sls galera
+salt -C 'I@galera:slave' state.sls galera
+# Check galera status
+salt -C 'I@galera:master' mysql.status | grep -A1 wsrep_cluster_size
+salt -C 'I@galera:slave' mysql.status | grep -A1 wsrep_cluster_size
+
+# Install haproxy
+salt -C 'I@haproxy:proxy' state.sls haproxy
+salt -C 'I@haproxy:proxy' service.status haproxy
+salt -I 'haproxy:proxy' service.restart rsyslog
+
+# Install memcached
+salt -C 'I@memcached:server' state.sls memcached
diff --git a/scripts/stacklight_infra_install.sh b/scripts/stacklight_infra_install.sh
new file mode 100755
index 0000000..3769aa9
--- /dev/null
+++ b/scripts/stacklight_infra_install.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+# Install the StackLight backends
+salt -C 'I@elasticsearch:server' state.sls elasticsearch.server -b 1
+salt -C 'I@influxdb:server' state.sls influxdb -b 1
+salt -C 'I@kibana:server' state.sls kibana.server -b 1
+salt -C 'I@grafana:server' state.sls grafana.server -b 1
+salt -C 'I@nagios:server' state.sls nagios.server
+salt -C 'I@elasticsearch:client' state.sls elasticsearch.client.service
+salt -C 'I@kibana:client' state.sls kibana.client.service
+salt -C 'I@kibana:client or I@elasticsearch:client' --async service.restart salt-minion
+sleep 10
+salt -C 'I@elasticsearch:client' state.sls elasticsearch.client
+salt -C 'I@kibana:client' state.sls kibana.client
diff --git a/scripts/stacklight_monitor_install.sh b/scripts/stacklight_monitor_install.sh
new file mode 100755
index 0000000..159ad04
--- /dev/null
+++ b/scripts/stacklight_monitor_install.sh
@@ -0,0 +1,52 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+# Start by flusing Salt Mine to make sure it is clean
+# Also clean-up the grains files to make sure that we start from a clean state
+salt "*" mine.flush
+salt "*" file.remove /etc/salt/grains.d/collectd
+salt "*" file.remove /etc/salt/grains.d/grafana
+salt "*" file.remove /etc/salt/grains.d/heka
+salt "*" file.remove /etc/salt/grains
+
+# Install collectd and heka services on the nodes, this will also generate the
+# metadata that goes into the grains and eventually into Salt Mine
+salt "*" state.sls collectd
+salt "*" state.sls heka
+
+# Gather the Grafana metadata as grains
+salt -C 'I@grafana:collector' state.sls grafana.collector
+
+# Update Salt Mine
+salt "*" state.sls salt.minion.grains
+salt "*" saltutil.refresh_modules
+salt "*" mine.update
+
+sleep 5
+
+# Update Heka
+salt -C 'I@heka:aggregator:enabled:True or I@heka:remote_collector:enabled:True' state.sls heka
+
+# Update collectd
+salt -C 'I@collectd:remote_client:enabled:True' state.sls collectd
+
+# Update Nagios
+salt -C 'I@nagios:server' state.sls nagios
+# Stop the Nagios service because the package starts it by default and it will
+# started later only on the node holding the VIP address
+salt -C 'I@nagios:server' service.stop nagios3
+
+# Finalize the configuration of Grafana (add the dashboards...)
+salt -C 'I@grafana:client' state.sls grafana.client.service
+salt -C 'I@grafana:client' --async service.restart salt-minion; sleep 10
+salt -C 'I@grafana:client' state.sls grafana.client
+
+# Get the StackLight monitoring VIP addres
+vip=$(salt-call pillar.data _param:stacklight_monitor_address --out key|grep _param: |awk '{print $2}')
+vip=${vip:=172.16.10.253}
+
+# (re)Start manually the services that are bound to the monitoring VIP
+salt -G "ipv4:$vip" service.restart remote_collectd
+salt -G "ipv4:$vip" service.restart remote_collector
+salt -G "ipv4:$vip" service.restart aggregator
+salt -G "ipv4:$vip" service.restart nagios3