diff --git a/classes/cluster/drivetrain_ha/bootstrap_vars b/classes/cluster/drivetrain_ha/bootstrap_vars
new file mode 100644
index 0000000..74d82c2
--- /dev/null
+++ b/classes/cluster/drivetrain_ha/bootstrap_vars
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(glusterfs docker aptly keepalived rundeck jenkins gerrit openldap devops-portal)
diff --git a/classes/cluster/drivetrain_ha/cicd/control/init.yml b/classes/cluster/drivetrain_ha/cicd/control/init.yml
index 6fb78de..a8977d6 100644
--- a/classes/cluster/drivetrain_ha/cicd/control/init.yml
+++ b/classes/cluster/drivetrain_ha/cicd/control/init.yml
@@ -90,7 +90,8 @@
   # Rundeck
   - system.rundeck.client.runbook
 
-  - cluster.drivetrain_ha
+  - cluster.drivetrain_ha.cicd
+ # - cluster.drivetrain_ha
 parameters:
   _param:
     cluster_node01_name: ci01
@@ -109,6 +110,8 @@
     cluster_public_host: ${_param:control_public_host}
     glusterfs_service_host: ${_param:control_vip_address}
 
+    admin_email: root@localhost
+
     # Haproxy SSL configuration
     cluster_ssl_certificate:
       enabled: true
diff --git a/classes/cluster/drivetrain_ha/cicd/control/master.yml b/classes/cluster/drivetrain_ha/cicd/control/master.yml
index 6d93273..4437b9e 100644
--- a/classes/cluster/drivetrain_ha/cicd/control/master.yml
+++ b/classes/cluster/drivetrain_ha/cicd/control/master.yml
@@ -43,4 +43,4 @@
   # ..projects
   - system.rundeck.client.project.cicd
   # At last
-  - cluster.drivetrain_ha.cicd.control
+  - cluster.drivetrain_ha
diff --git a/classes/cluster/drivetrain_ha/cicd/control/slave.yml b/classes/cluster/drivetrain_ha/cicd/control/slave.yml
index a3a289a..bdc7137 100644
--- a/classes/cluster/drivetrain_ha/cicd/control/slave.yml
+++ b/classes/cluster/drivetrain_ha/cicd/control/slave.yml
@@ -1,3 +1,3 @@
 classes:
-  - cluster.drivetrain_ha.cicd.control
-  - system.docker.swarm.manager
+- system.docker.swarm.manager
+- cluster.drivetrain_ha
diff --git a/classes/cluster/drivetrain_ha/cicd/init.yml b/classes/cluster/drivetrain_ha/cicd/init.yml
index 816b66f..9b736f2 100644
--- a/classes/cluster/drivetrain_ha/cicd/init.yml
+++ b/classes/cluster/drivetrain_ha/cicd/init.yml
@@ -1,6 +1,11 @@
 parameters:
   _param:
+    cluster_public_host: ${_param:cicd_control_address}
     cicd_control_address: 172.16.10.254
+    cicd_control_hostname: cid
+    cicd_control_node01_hostname: cid01
+    cicd_control_node02_hostname: cid02
+    cicd_control_node03_hostname: cid03
     cicd_control_node01_address: 172.16.10.11
     cicd_control_node02_address: 172.16.10.12
     cicd_control_node03_address: 172.16.10.13
diff --git a/classes/cluster/drivetrain_ha/infra/config.yml b/classes/cluster/drivetrain_ha/infra/config.yml
index fbad093..3ab5749 100644
--- a/classes/cluster/drivetrain_ha/infra/config.yml
+++ b/classes/cluster/drivetrain_ha/infra/config.yml
@@ -22,6 +22,12 @@
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
+      environment:
+        prd:
+          formula:
+            glusterfs:
+              source: pkg
+              name: salt-formula-glusterfs
   linux:
     network:
       interface:
@@ -44,7 +50,7 @@
             salt_master_host:
               value_template: <<node_master_ip>>
         infra_config:
-          expression: <<node_hostname>>__startswith__cfg
+          expression: <<node_hostname>>__equals__cid01
           cluster_param:
             infra_config_address:
               value_template: <<node_control_ip>>
@@ -52,19 +58,50 @@
               value_template: <<node_deploy_ip>>
             cluster_domain:
               value_template: <<node_domain>>
-        cicd_control01:
-          expression: <<node_hostname>>__equals__cid01
-          cluster_param:
-            cicd_control_node01_address:
+            cicd_control_node_node01_address:
               value_template: <<node_control_ip>>
-        cicd_control02:
+        cicd_control_node02:
           expression: <<node_hostname>>__equals__cid02
           cluster_param:
-            cicd_control_node02_address:
+            cicd_control_node_node02_address:
               value_template: <<node_control_ip>>
-        cicd_control03:
+        cicd_control_node03:
           expression: <<node_hostname>>__equals__cid03
           cluster_param:
             cicd_control_node03_address:
               value_template: <<node_control_ip>>
+      node:
+        cicd_control_node01:
+          name: ${_param:cicd_control_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.infra.config
+          - cluster.${_param:cluster_name}.cicd.control.master
+          params:
+            salt_master_host: 127.0.0.1
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node01_address}
+            keepalived_vip_priority: 103
+        cicd_control_node02:
+          name: ${_param:cicd_control_node02_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.slave
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node02_address}
+            keepalived_vip_priority: 102
+            docker_swarm_role: worker
+        cicd_control_node03:
+          name: ${_param:cicd_control_node03_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.slave
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node03_address}
+            keepalived_vip_priority: 101
+            docker_swarm_role: worker
 
diff --git a/classes/cluster/drivetrain_ha/infra/init.yml b/classes/cluster/drivetrain_ha/infra/init.yml
index d5e7cd7..0e2ecb7 100644
--- a/classes/cluster/drivetrain_ha/infra/init.yml
+++ b/classes/cluster/drivetrain_ha/infra/init.yml
@@ -13,11 +13,10 @@
     cluster_domain: drivetrain_ha.local
     cluster_name: drivetrain_ha
     apt_mk_version: nightly
-    admin_email: root@localhosti
-    infra_config_hostname: cfg01
+    infra_config_hostname: cid01
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.100
-    salt_minion_ca_host: ci01.${_param:cluster_domain}
+    salt_minion_ca_host: cid01.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
   linux:
     network:
diff --git a/classes/cluster/drivetrain_ha/init.yml b/classes/cluster/drivetrain_ha/init.yml
index 1a37367..f35b844 100644
--- a/classes/cluster/drivetrain_ha/init.yml
+++ b/classes/cluster/drivetrain_ha/init.yml
@@ -1,5 +1,6 @@
 classes:
+- cluster.drivetrain_ha.cicd.control
 - cluster.drivetrain_ha.infra
-- cluster.drivetrain_ha.cicd
+#- cluster.drivetrain_ha.cicd
 - cluster.overrides
 
diff --git a/classes/cluster/drivetrain_ha_clusters/cicd/init.yml b/classes/cluster/drivetrain_ha_clusters/cicd/init.yml
index b4740bf..053a652 100644
--- a/classes/cluster/drivetrain_ha_clusters/cicd/init.yml
+++ b/classes/cluster/drivetrain_ha_clusters/cicd/init.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     cicd_control_hostname: cid
-    cicd_control_address: 172.16.10.254
+    cicd_control_address: 172.16.10.252
     cicd_control_node01_hostname: cid01
     cicd_control_node01_address: 172.16.10.11
     cicd_control_node02_hostname: cid02
diff --git a/classes/cluster/drivetrain_ha_clusters/infra/config.yml b/classes/cluster/drivetrain_ha_clusters/infra/config.yml
index 4cb7db5..25e78fa 100644
--- a/classes/cluster/drivetrain_ha_clusters/infra/config.yml
+++ b/classes/cluster/drivetrain_ha_clusters/infra/config.yml
@@ -15,8 +15,6 @@
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_master_host: ${_param:infra_config_deploy_address}
-    salt_api_password: hovno12345!
-    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     cluster_public_host: ${_param:infra_config_address}
   salt:
     master:
@@ -56,19 +54,52 @@
               value_template: <<node_deploy_ip>>
             cluster_domain:
               value_template: <<node_domain>>
-        cicd_control01:
+        cicd_control_node01:
           expression: <<node_hostname>>__equals__cid01
           cluster_param:
             cicd_control_node01_address:
               value_template: <<node_control_ip>>
-        cicd_control02:
+        cicd_control_node02:
           expression: <<node_hostname>>__equals__cid02
           cluster_param:
             cicd_control_node02_address:
               value_template: <<node_control_ip>>
-        cicd_control03:
+        cicd_control_node03:
           expression: <<node_hostname>>__equals__cid03
           cluster_param:
             cicd_control_node03_address:
               value_template: <<node_control_ip>>
+      node:
+        cicd_control_node01:
+          name: ${_param:cicd_control_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.master
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node01_address}
+            keepalived_vip_priority: 103
+        cicd_control_node02:
+          name: ${_param:cicd_control_node02_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.slave
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node02_address}
+            keepalived_vip_priority: 102
+            docker_swarm_role: worker
+        cicd_control_node03:
+          name: ${_param:cicd_control_node03_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.cicd.control.slave
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
+            single_address: ${_param:cicd_control_node03_address}
+            keepalived_vip_priority: 101
+            docker_swarm_role: worker
 
diff --git a/classes/cluster/drivetrain_ha_clusters/infra/init.yml b/classes/cluster/drivetrain_ha_clusters/infra/init.yml
index 69dca1a..da06ecd 100644
--- a/classes/cluster/drivetrain_ha_clusters/infra/init.yml
+++ b/classes/cluster/drivetrain_ha_clusters/infra/init.yml
@@ -19,6 +19,8 @@
     infra_config_deploy_address: 192.168.10.100
     salt_minion_ca_host: ci01.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
+    salt_api_password: hovno12345!
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
       host:
diff --git a/classes/cluster/k8s_ha_calico/MAINTAINERS b/classes/cluster/k8s_ha_calico/MAINTAINERS
new file mode 100644
index 0000000..3c56b7b
--- /dev/null
+++ b/classes/cluster/k8s_ha_calico/MAINTAINERS
@@ -0,0 +1 @@
+Tomáš Kukrál <tkukral@mirantis.com
diff --git a/classes/cluster/k8s_ha_contrail/MAINTAINERS b/classes/cluster/k8s_ha_contrail/MAINTAINERS
new file mode 100644
index 0000000..3c56b7b
--- /dev/null
+++ b/classes/cluster/k8s_ha_contrail/MAINTAINERS
@@ -0,0 +1 @@
+Tomáš Kukrál <tkukral@mirantis.com
diff --git a/classes/cluster/os_aio_contrail/infra/config.yml b/classes/cluster/os_aio_contrail/infra/config.yml
index 4214661..8accdcf 100755
--- a/classes/cluster/os_aio_contrail/infra/config.yml
+++ b/classes/cluster/os_aio_contrail/infra/config.yml
@@ -9,13 +9,22 @@
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
-- system.keystone.client.single
+- system.keystone.client.core
 - system.keystone.client.service.aodh
 - system.keystone.client.service.ceilometer
-- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
+#- system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
 - system.keystone.client.service.cinder3
-# system.keystone.client.service.designate
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
 #- system.mysql.client.single
 - system.reclass.storage.system.openstack_control_single
 - system.reclass.storage.system.opencontrail_control_cluster
diff --git a/classes/cluster/os_aio_ovs/infra/config.yml b/classes/cluster/os_aio_ovs/infra/config.yml
index 494e23b..353009a 100644
--- a/classes/cluster/os_aio_ovs/infra/config.yml
+++ b/classes/cluster/os_aio_ovs/infra/config.yml
@@ -9,11 +9,22 @@
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
-- system.keystone.client.single
+- system.keystone.client.core
+- system.keystone.client.service.aodh
 - system.keystone.client.service.ceilometer
-- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
+- system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
 - system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
 - system.reclass.storage.system.openstack_control_single
 - cluster.os_aio_ovs.openstack.proxy
 - cluster.os_aio_ovs
diff --git a/classes/cluster/os_ha_contrail/infra/config.yml b/classes/cluster/os_ha_contrail/infra/config.yml
index 0277722..e38823a 100755
--- a/classes/cluster/os_ha_contrail/infra/config.yml
+++ b/classes/cluster/os_ha_contrail/infra/config.yml
@@ -9,11 +9,22 @@
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
-- system.keystone.client.single
-- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
+- system.keystone.client.core
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
 - system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
 - system.mysql.client
 - system.mysql.client.database.cinder
 - system.mysql.client.database.glance
diff --git a/classes/cluster/os_ha_contrail/openstack/control.yml b/classes/cluster/os_ha_contrail/openstack/control.yml
index dd47cdf..408327b 100755
--- a/classes/cluster/os_ha_contrail/openstack/control.yml
+++ b/classes/cluster/os_ha_contrail/openstack/control.yml
@@ -30,6 +30,7 @@
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
 - system.galera.server.database.designate
+- system.haproxy.proxy.listen.openstack.nova-placement
 - cluster.os_ha_contrail
 parameters:
   _param:
diff --git a/classes/cluster/os_ha_ovs/infra/config.yml b/classes/cluster/os_ha_ovs/infra/config.yml
index 783586f..16b265d 100644
--- a/classes/cluster/os_ha_ovs/infra/config.yml
+++ b/classes/cluster/os_ha_ovs/infra/config.yml
@@ -9,10 +9,22 @@
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
-- system.keystone.client.single
-- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
+- system.keystone.client.core
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
 - system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
 - system.mysql.client
 - system.mysql.client.database.cinder
 - system.mysql.client.database.glance
diff --git a/classes/cluster/os_ha_ovs/openstack/control.yml b/classes/cluster/os_ha_ovs/openstack/control.yml
index 5e8accb..532b41f 100644
--- a/classes/cluster/os_ha_ovs/openstack/control.yml
+++ b/classes/cluster/os_ha_ovs/openstack/control.yml
@@ -26,6 +26,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.haproxy.proxy.listen.openstack.nova-placement
 - cluster.os_ha_ovs.openstack.dashboard
 - cluster.os_ha_ovs
 parameters:
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/config.yml b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
index b60ba47..72d0c50 100644
--- a/classes/cluster/os_ha_ovs_syndic/infra/config.yml
+++ b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
@@ -9,10 +9,19 @@
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
-- system.keystone.client.single
-- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
+- system.keystone.client.core
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
 - system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
 - system.mysql.client
 - system.mysql.client.database.cinder
 - system.mysql.client.database.glance
diff --git a/classes/cluster/os_ha_ovs_syndic/openstack/control.yml b/classes/cluster/os_ha_ovs_syndic/openstack/control.yml
index 1b3d2db..02f5650 100644
--- a/classes/cluster/os_ha_ovs_syndic/openstack/control.yml
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/control.yml
@@ -26,6 +26,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.haproxy.proxy.listen.openstack.nova-placement
 - cluster.os_ha_ovs_syndic.openstack.dashboard
 - cluster.os_ha_ovs_syndic
 parameters:
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index ec66592..17d6813 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -24,7 +24,6 @@
 - system.telegraf.agent.remote
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.etcd
 - system.prometheus.server.target.kubernetes
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index 3a54585..b5dbeac 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -24,7 +24,6 @@
 - system.telegraf.agent.remote
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.etcd
 - system.prometheus.server.target.kubernetes
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index d84a3f2..844d189 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -9,11 +9,22 @@
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
-- system.keystone.client.single
-- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
+- system.keystone.client.core
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
 - system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
 - system.mysql.client
 - system.mysql.client.database.cinder
 - system.mysql.client.database.glance
diff --git a/classes/cluster/sl_os_contrail/openstack/control.yml b/classes/cluster/sl_os_contrail/openstack/control.yml
index 4437a6d..e2579a3 100755
--- a/classes/cluster/sl_os_contrail/openstack/control.yml
+++ b/classes/cluster/sl_os_contrail/openstack/control.yml
@@ -32,6 +32,7 @@
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
 - system.galera.server.database.designate
+- system.haproxy.proxy.listen.openstack.nova-placement
 - cluster.sl_os_contrail
 parameters:
   _param:
diff --git a/classes/cluster/sl_os_ovs/infra/config.yml b/classes/cluster/sl_os_ovs/infra/config.yml
index a1c2d1a..336a9d2 100644
--- a/classes/cluster/sl_os_ovs/infra/config.yml
+++ b/classes/cluster/sl_os_ovs/infra/config.yml
@@ -9,10 +9,22 @@
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
-- system.keystone.client.single
-- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
+- system.keystone.client.core
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
 - system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
 - system.mysql.client
 - system.mysql.client.database.cinder
 - system.mysql.client.database.glance
diff --git a/classes/cluster/sl_os_ovs/openstack/control.yml b/classes/cluster/sl_os_ovs/openstack/control.yml
index 27e3f7f..5cf07fa 100644
--- a/classes/cluster/sl_os_ovs/openstack/control.yml
+++ b/classes/cluster/sl_os_ovs/openstack/control.yml
@@ -28,6 +28,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.haproxy.proxy.listen.openstack.nova-placement
 - cluster.sl_os_ovs
 parameters:
   _param:
diff --git a/classes/cluster/sl_os_ovs/stacklight/client.yml b/classes/cluster/sl_os_ovs/stacklight/client.yml
index d0ebb16..393449c 100644
--- a/classes/cluster/sl_os_ovs/stacklight/client.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/client.yml
@@ -1,6 +1,17 @@
 classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.sl_os_ovs.stacklight
-- service.grafana.collector
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+parameters:
+  _param:
+    # Elasticsearch/Kibana client parameters
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    # Grafana client parameters
+    grafana_address: ${_param:stacklight_monitor_address}
+    grafana_port: 15013
+    grafana_user: admin
+    grafana_password: ${_param:grafana_admin_password}
+    grafana_prometheus_address: ${_param:stacklight_monitor_address}
+    grafana_prometheus_port: 15010
diff --git a/classes/cluster/sl_os_ovs/stacklight/init.yml b/classes/cluster/sl_os_ovs/stacklight/init.yml
index 9621aa3..3b0c8bc 100644
--- a/classes/cluster/sl_os_ovs/stacklight/init.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/init.yml
@@ -1,36 +1,31 @@
 parameters:
   _param:
-    stacklight_monitor_address: 172.16.10.253
+    stacklight_monitor_address: 172.16.10.252
+    stacklight_monitor_node01_hostname: mon01
+    stacklight_monitor_node02_hostname: mon02
+    stacklight_monitor_node03_hostname: mon03
     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}
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+
+    # Glusterfs
+    glusterfs_service_host: ${_param:stacklight_monitor_address}
+
+    # Prometheus
+    prometheus_control_address: ${_param:stacklight_monitor_address}
+
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+
+    mysql_grafana_password: password
+    cluster_local_address: ${_param:single_address}
+    galera_server_cluster_name: monitoring_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
 
     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:
@@ -42,15 +37,15 @@
         mon01:
           address: ${_param:stacklight_monitor_node01_address}
           names:
-          - mon01
-          - mon01.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node01_hostname}
+          - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
         mon02:
           address: ${_param:stacklight_monitor_node02_address}
           names:
-          - mon02
-          - mon02.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node02_hostname}
+          - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
         mon03:
           address: ${_param:stacklight_monitor_node03_address}
           names:
-          - mon03
-          - mon03.${_param:cluster_domain}
+          - ${_param:stacklight_monitor_node03_hostname}
+          - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/sl_os_ovs/stacklight/server.yml b/classes/cluster/sl_os_ovs/stacklight/server.yml
index 4466fd8..351337d 100644
--- a/classes/cluster/sl_os_ovs/stacklight/server.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/server.yml
@@ -9,13 +9,14 @@
 - system.elasticsearch.server.curator
 - system.kibana.server.single
 - system.grafana.server.single
-- system.nagios.server.cluster
 - cluster.sl_os_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
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.dashboard
 parameters:
   _param:
     collectd_remote_collector_host: ${_param:stacklight_monitor_address}
@@ -34,12 +35,13 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_name: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-  linux:
-    network:
-      interface:
-        ens4:
-          enabled: true
-          type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
+    docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
+    docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
+    docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+    docker_image_grafana: grafana/grafana:4.3.2
+  elasticsearch:
+    server:
+      heap:
+        size: 1
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index 832a60c..20916d2 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -11,6 +11,7 @@
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
 - system.keystone.client.single
+- system.keystone.client.service.aodh
 - system.keystone.client.service.ceilometer
 - system.keystone.client.service.nova21
 - system.keystone.client.service.nova-placement
@@ -22,7 +23,7 @@
 - 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
+- system.reclass.storage.system.stacklightv2_server_cluster
 - cluster.virtual-mcp-ocata-dvr.openstack.proxy
 - cluster.virtual-mcp-ocata-dvr.stacklight.proxy
 - cluster.virtual-mcp-ocata-dvr
@@ -95,7 +96,3 @@
           - cluster.virtual-mcp-ocata-dvr.openstack.proxy
           params:
             linux_system_codename: xenial
-        stacklight_server_node01:
-          classes:
-          - system.influxdb.server.single
-          - system.influxdb.database.stacklight
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
index 6ee4dbe..9ea0fc7 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
@@ -1,13 +1,19 @@
 classes:
+- service.grafana.collector
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
+- system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
 - cluster.virtual-mcp-ocata-dvr.infra
 - cluster.virtual-mcp-ocata-dvr.openstack
 - cluster.virtual-mcp-ocata-dvr.stacklight
-- cluster.virtual-mcp-ocata-dvr.stacklight.client
+- cluster.overrides
 parameters:
   _param:
     cluster_domain: virtual-mcp-ocata-dvr.local
@@ -38,4 +44,4 @@
     stacklight_monitor_node03_address: 172.16.10.109
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
-
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
index 4c8112a..6d75d6c 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
@@ -4,9 +4,10 @@
 - system.linux.system.repo.saltstack.xenial
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
 - system.linux.network.interface.single_ovs_dvr
+- system.prometheus.exporters.libvirt
 - cluster.virtual-mcp-ocata-dvr
-- system.heka.alarm.openstack_compute
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
index 29bdc19..4fb5eaa 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
@@ -14,16 +14,21 @@
 - system.glusterfs.client.volume.keystone
 - system.glusterfs.server.volume.glance
 - system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.prometheus
 - system.glusterfs.server.cluster
 - system.glance.control.cluster
-- system.heka.alarm.openstack_control
 - system.nova.control.cluster
 - system.neutron.control.openvswitch.cluster
 - system.cinder.control.cluster
 - system.heat.server.cluster
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
 - system.designate.server.cluster
 - system.designate.server.backend.pdns
 - system.galera.server.cluster
+- system.galera.server.database.aodh
 - system.galera.server.database.ceilometer
 - system.galera.server.database.cinder
 - system.galera.server.database.glance
@@ -39,6 +44,7 @@
   _param:
     keepalived_vip_interface: ens4
     keepalived_openstack_telemetry_vip_interface: ens4
+    keepalived_openstack_telemetry_vip_address: 172.16.10.252
   linux:
     system:
       package:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index b744d5c..537cafb 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -73,6 +73,8 @@
     ceilometer_service_host: 172.16.10.108
     cinder_version: ${_param:openstack_version}
     cinder_service_host: ${_param:cluster_vip_address}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:cluster_vip_address}
     ceilometer_graphite_publisher_host: 172.16.10.107
     ceilometer_graphite_publisher_port: 2013
     nova_version: ${_param:openstack_version}
@@ -97,6 +99,7 @@
     mysql_designate_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
+    keystone_aodh_password: workshop
     keystone_ceilometer_password: workshop
     keystone_cinder_password: workshop
     keystone_glance_password: workshop
@@ -115,6 +118,7 @@
     mongodb_ceilometer_password: cloudlab
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
index 7911d0f..a8f20a4 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
@@ -1,6 +1,22 @@
 classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.virtual-mcp-ocata-dvr.stacklight
-- service.grafana.collector
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+- cluster.virtual-mcp-ocata-dvr
+parameters:
+  _param:
+    # Elasticsearch/Kibana client parameters
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    # Grafana client parameters
+    grafana_address: ${_param:stacklight_monitor_address}
+    grafana_port: 15013
+    grafana_user: admin
+    grafana_password: ${_param:grafana_admin_password}
+    grafana_prometheus_address: ${_param:stacklight_monitor_address}
+    grafana_prometheus_port: 15010
+
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/init.yml
index 48bffdc..0b10c03 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/init.yml
@@ -1,28 +1,14 @@
 parameters:
   _param:
+    prometheus_control_address: ${_param:stacklight_monitor_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}
     stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/proxy.yml
index 77a5f3f..b874c16 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/proxy.yml
@@ -1,12 +1,14 @@
 classes:
 - system.nginx.server.single
-- system.nginx.server.proxy.grafana_web
-- system.nginx.server.proxy.kibana_web
-- system.nginx.server.proxy.nagios_web
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
 - cluster.virtual-mcp-ocata-dvr
 parameters:
   _param:
+    nginx_proxy_grafana_port: 15013
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
index fb2bf0d..a99b73c 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
@@ -1,39 +1,69 @@
 classes:
-- system.collectd.remote_client.cluster
+- system.docker.host
+- system.linux.system.repo.glusterfs
 - system.linux.system.repo.influxdb
+- system.linux.system.repo.mcp.salt
 - system.linux.system.repo.tcp_elastic
-- system.heka.remote_collector.cluster
+- system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
+- system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.prometheus
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
-- system.grafana.server.single
-- system.nagios.server.cluster
-- cluster.virtual-mcp-ocata-dvr
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.grafana
+- system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
-- system.keepalived.cluster.instance.stacklight_monitor_vip
+- system.influxdb.server.single
+- system.influxdb.database.stacklight
+- system.influxdb.database.ceilometer
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-ocata-dvr
 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
+    keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
+    keepalived_prometheus_vip_password: 'password'
+    keepalived_prometheus_vip_interface: ens4
     cluster_vip_address: ${_param:stacklight_monitor_address}
     cluster_elasticsearch_port: 9200
     cluster_kibana_port: 5601
-    cluster_grafana_port: 3000
-    cluster_node01_name: mon01
+    cluster_node01_hostname: mon01
     cluster_node01_address: ${_param:stacklight_monitor_node01_address}
-    cluster_node02_name: mon02
+    cluster_node02_hostname: mon02
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
-    cluster_node03_name: mon03
+    cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+    docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
+    docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
+    docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+    docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
+    docker_image_grafana: grafana/grafana:4.3.2
+    prometheus_glusterfs_service_host: ${_param:openstack_control_address}
+    glusterfs_node01_address: ${_param:openstack_control_node01_address}
+    glusterfs_node02_address: ${_param:openstack_control_node02_address}
+    glusterfs_node03_address: ${_param:openstack_control_node03_address}
+    influxdb_port: 8086
+    influxdb_admin_password: password
+    influxdb_stacklight_password: lmapass
+    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
+    prometheus_influxdb_db: lma
+    prometheus_influxdb_username: lma
+    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+    remote_collector_telegraf_host: monitoring_remote_agent
   linux:
     network:
       interface:
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
index 3295d9c..46d5e14 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
@@ -47,6 +47,7 @@
 parameters:
   _param:
     keepalived_vip_interface: eth1
+    keepalived_openstack_telemetry_vip_address: 172.16.10.251
     cluster_vip_address: ${_param:openstack_control_address}
     cluster_local_address: ${_param:single_address}
     cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
index 7a60877..515cb99 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
@@ -33,6 +33,7 @@
 parameters:
   _param:
     keepalived_vip_interface: eth1
+    keepalived_openstack_telemetry_vip_address: 172.16.10.252
   linux:
     system:
       package:
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/control.yml b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
index b235a84..01358b1 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
@@ -32,6 +32,7 @@
 parameters:
   _param:
     keepalived_vip_interface: eth1
+    keepalived_openstack_telemetry_vip_address: 172.16.10.252
   linux:
     system:
       package:
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
new file mode 100644
index 0000000..b50fd3a
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio/.env
@@ -0,0 +1,2 @@
+FORMULAS_SALT_MASTER+=(mysql grafana libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate)
+formula_services+=(${formula_services[@]} ${FORMULAS_SALT_MASTER[@]})
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
new file mode 100644
index 0000000..37f1323
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -0,0 +1,10 @@
+classes:
+  - cluster.virtual-mcp11-aio
+parameters:
+  _param:
+    linux_system_codename: xenial
+    apt_mk_version: stable
+  linux:
+    system:
+      name: cfg01
+      domain: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index d0c5f40..3482262 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -20,15 +20,17 @@
     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
+    reclass_config_master: 192.168.10.90
+    single_address: 172.16.10.90
+    infra_config_address: ${_param:single_address}
+    cluster_domain: virtual-mcp11-aio.local
 
     mysql_admin_user: root
     mysql_admin_password: workshop
     rabbitmq_secret_key: workshop
     rabbitmq_admin_password: workshop
     loopback_device_size: 10
-    salt_master_host: 192.168.10.100
+    salt_master_host: 192.168.10.90
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
@@ -54,6 +56,13 @@
         br-floating:
           enabled: true
           type: ovs_bridge
+        phy-public:
+          enabled: true
+          type: ovs_port
+          bridge: br-floating
+          proto: static
+          address: ${_param:openstack_public_neutron_subnet_gateway}
+          netmask: 255.255.255.0
   mysql:
     server:
       version: '5.6'
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 3984c02..fe37cb6 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -21,6 +21,7 @@
 - system.glance.control.single
 - system.nova.control.single
 - system.neutron.control.openvswitch.single
+- system.neutron.client.service.public
 - system.heat.server.single
 - system.nova.compute.single
 - service.neutron.gateway.single
@@ -99,7 +100,11 @@
       rndc_host: ${_param:single_address}
       rndc_port: 953
       rndc_key_file: /etc/designate/rndc.key
-    linux_system_repo: 'deb [arch=amd64] http://mirror.fuel-infra.org/mcp-repos/ocata/xenial ocata main'
+    linux_system_repo: deb [arch=amd64] http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/xenial ${_param:openstack_version} main
+    openstack_public_neutron_subnet_gateway:  192.168.130.1
+    openstack_public_neutron_subnet_cidr: 192.168.130.0/24
+    openstack_public_neutron_subnet_allocation_start: 192.168.130.10
+    openstack_public_neutron_subnet_allocation_end: 192.168.130.254
   neutron:
     server:
       message_queue:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index 7720b8c..6e16380 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -19,7 +19,6 @@
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.etcd
 - system.prometheus.server.target.kubernetes
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/MAINTAINERS b/classes/cluster/virtual-mcp11-k8s-calico/MAINTAINERS
new file mode 100644
index 0000000..3c56b7b
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico/MAINTAINERS
@@ -0,0 +1 @@
+Tomáš Kukrál <tkukral@mirantis.com
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 83a5a6e..0e92b98 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -1,6 +1,5 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.influxdb
 - system.linux.system.repo.tcp_elastic
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.openstack
@@ -9,24 +8,25 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
+- system.glusterfs.client.volume.influxdb
 - system.glusterfs.server.cluster
 - system.glusterfs.server.volume.prometheus
+- system.glusterfs.server.volume.influxdb
 - system.galera.server.cluster
 - system.galera.server.database.grafana
-- system.influxdb.server.single
-- system.influxdb.database.stacklight
+- system.influxdb.client
+- system.influxdb.client.database.stacklight
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.etcd
 - system.prometheus.server.target.kubernetes
 - system.prometheus.server.target.dns
+- system.docker.swarm.stack.influxdb
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-k8s-calico.infra
@@ -40,6 +40,7 @@
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
     docker_image_grafana: grafana/grafana:4.3.2
+    docker_influxdb_image: influxdb:1.2
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
@@ -59,13 +60,18 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
     grafana_database_password: ${_param:mysql_grafana_password}
-    influxdb_port: 8086
+    # InfluxDB
     influxdb_admin_password: password
+    influxdb_port: 15016
     influxdb_stacklight_password: lmapass
+    influxdb_client_host: ${_param:stacklight_monitor_address}
+    influxdb_client_port: ${_param:influxdb_port}
+    influxdb_client_password: ${_param:influxdb_admin_password}
     prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
     prometheus_influxdb_db: lma
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+    telegraf_remote_agent_influxdb_address: ${_param:stacklight_monitor_address}
   elasticsearch:
     server:
       heap:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/MAINTAINERS b/classes/cluster/virtual-mcp11-k8s-contrail/MAINTAINERS
new file mode 100644
index 0000000..3c56b7b
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/MAINTAINERS
@@ -0,0 +1 @@
+Tomáš Kukrál <tkukral@mirantis.com
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index a637712..ea728de 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -24,7 +24,6 @@
 - system.telegraf.agent.remote
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.etcd
 - system.prometheus.server.target.kubernetes
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
diff --git a/classes/system b/classes/system
index be1bc7b..92f02e6 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit be1bc7be3d43107a8d0fd747fb432bce34f16d30
+Subproject commit 92f02e68a328f9e8510b519c120b2d44a3512ad6
diff --git a/nodes/cfg01.virtual-mcp11-aio.local.yml b/nodes/cfg01.virtual-mcp11-aio.local.yml
index d1e5865..88f3267 100644
--- a/nodes/cfg01.virtual-mcp11-aio.local.yml
+++ b/nodes/cfg01.virtual-mcp11-aio.local.yml
@@ -1,13 +1,6 @@
 classes:
 - system.linux.system.single
-- cluster.virtual-mcp11-aio
+- cluster.virtual-mcp11-aio.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
-    apt_mk_version: nightly
-    salt_master_host: 127.0.0.1
-    single_address: 127.0.0.1
-  linux:
-    system:
-      name: cfg01
-      domain: virtual-mcp11-aio.local