diff --git a/classes/cluster/k8s_aio_calico/kubernetes/compute.yml b/classes/cluster/k8s_aio_calico/kubernetes/compute.yml
index 5559236..0190a19 100644
--- a/classes/cluster/k8s_aio_calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s_aio_calico/kubernetes/compute.yml
@@ -16,6 +16,8 @@
       pkgs:
         - docker-engine=1.12.6-0~ubuntu-xenial
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network:
diff --git a/classes/cluster/k8s_aio_contrail/kubernetes/compute.yml b/classes/cluster/k8s_aio_contrail/kubernetes/compute.yml
index 5fd2102..3ab2f0b 100644
--- a/classes/cluster/k8s_aio_contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s_aio_contrail/kubernetes/compute.yml
@@ -30,6 +30,8 @@
       pkgs:
         - docker-engine=1.12.6-0~ubuntu-xenial
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network:
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/compute.yml b/classes/cluster/k8s_ha_calico/kubernetes/compute.yml
index 1f43281..d1ffd64 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/compute.yml
@@ -16,6 +16,8 @@
       pkgs:
         - docker-engine=1.12.6-0~ubuntu-xenial
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network:
diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml b/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml
index 8a4855b..1424aec 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/compute.yml
@@ -30,6 +30,8 @@
       pkgs:
         - docker-engine=1.12.6-0~ubuntu-xenial
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network:
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index 4295be4..eb979f9 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -10,16 +10,15 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - 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.relay.cluster
 - system.influxdb.server.single
 - system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
@@ -34,6 +33,7 @@
 parameters:
   _param:
     cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_local_address: ${_param:single_address}
     cluster_public_host: mon
     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
@@ -53,6 +53,9 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+    # Galera
+    galera_innodb_buffer_pool_size: 1024M
+    galera_max_connections: 200
     # Kibana
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
     # Galera
diff --git a/classes/cluster/sl_k8s_contrail/stacklight/server.yml b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
index 8b30a14..cc485cb 100644
--- a/classes/cluster/sl_k8s_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_contrail/stacklight/server.yml
@@ -10,12 +10,13 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - service.haproxy.proxy.single
 - system.galera.server.cluster
 - system.galera.server.database.grafana
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
+- system.influxdb.relay.cluster
 - system.influxdb.server.single
 - system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
@@ -31,6 +32,7 @@
   _param:
     cluster_public_host: mon
     cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_local_address: ${_param:single_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
@@ -43,6 +45,8 @@
     keepalived_prometheus_vip_interface: ens4
     # Galera
     openstack_version: ocata
+    galera_innodb_buffer_pool_size: 1024M
+    galera_max_connections: 200
     # Grafana
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index 819404c..243ec03 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -11,8 +11,9 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - service.haproxy.proxy.single
+- system.influxdb.relay.cluster
 - system.influxdb.server.single
 - system.influxdb.database.prometheus
 - system.keepalived.cluster.instance.prometheus_server_vip
@@ -31,6 +32,7 @@
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
     cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_local_address: ${_param:single_address}
     cluster_elasticsearch_port: 9200
     cluster_kibana_port: 5601
     cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
@@ -80,4 +82,4 @@
   elasticsearch:
     server:
       heap:
-        size: 1
\ No newline at end of file
+        size: 1
diff --git a/classes/cluster/sl_os_ovs/stacklight/client.yml b/classes/cluster/sl_os_ovs/stacklight/client.yml
index 4d473ac..40a4c38 100644
--- a/classes/cluster/sl_os_ovs/stacklight/client.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/client.yml
@@ -14,4 +14,3 @@
     grafana_password: ${_param:grafana_admin_password}
     grafana_prometheus_address: ${_param:stacklight_monitor_address}
     grafana_prometheus_port: 15010
-    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
diff --git a/classes/cluster/sl_os_ovs/stacklight/server.yml b/classes/cluster/sl_os_ovs/stacklight/server.yml
index e5e2cc6..c48b77c 100644
--- a/classes/cluster/sl_os_ovs/stacklight/server.yml
+++ b/classes/cluster/sl_os_ovs/stacklight/server.yml
@@ -8,12 +8,13 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - service.haproxy.proxy.single
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
 - system.galera.server.cluster
 - system.galera.server.database.grafana
+- system.influxdb.relay.cluster
 - system.influxdb.server.single
 - system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
@@ -35,6 +36,7 @@
     keepalived_prometheus_vip_password: password
     keepalived_prometheus_vip_interface: ens4
     cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_local_address: ${_param:single_address}
     cluster_elasticsearch_port: 9200
     cluster_kibana_port: 5601
     cluster_grafana_port: 3000
@@ -86,4 +88,4 @@
     cluster:
       instance:
         VIP:
-          enabled: false
\ No newline at end of file
+          enabled: false
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
index a8f20a4..c6bf4ac 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/client.yml
@@ -16,6 +16,7 @@
     grafana_password: ${_param:grafana_admin_password}
     grafana_prometheus_address: ${_param:stacklight_monitor_address}
     grafana_prometheus_port: 15010
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
 
     cluster_node01_address: ${_param:stacklight_monitor_node01_address}
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 33e63a8..ab81805 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/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
@@ -23,6 +24,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.stacklightv2_server_cluster
 - cluster.virtual-mcp-ocata-ovs.openstack.proxy
 - cluster.virtual-mcp-ocata-ovs.stacklight.proxy
 - cluster.virtual-mcp-ocata-ovs
@@ -162,12 +164,6 @@
           params:
             mysql_cluster_role: slave
             linux_system_codename: xenial
-        stacklight_server_node01:
-          classes:
-          - system.influxdb.server.single
-          - system.influxdb.database.stacklight
-          params:
-            linux_system_codename: xenial
         openstack_compute_node01:
           params:
             single_address: 172.16.10.105
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
index 2370032..e9739f2 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
@@ -1,12 +1,17 @@
 classes:
+- system.heka.log_collector.output.telegraf
+- system.linux.system.repo.mcp.extra
 - system.linux.system.single
-- cluster.virtual-mcp-ocata-ovs.infra
-- cluster.virtual-mcp-ocata-ovs.openstack
+- 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-ovs.infra
+- cluster.virtual-mcp-ocata-ovs.openstack
 - cluster.virtual-mcp-ocata-ovs.stacklight
-- cluster.virtual-mcp-ocata-ovs.stacklight.client
+
 
 parameters:
   _param:
@@ -21,6 +26,7 @@
     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_gateway_address: 172.16.10.110
     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}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
index 6d80e49..7a25b90 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
@@ -5,7 +5,8 @@
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
-- system.heka.alarm.openstack_compute
+- system.ceilometer.agent.cluster
+- system.prometheus.exporters.libvirt
 - cluster.virtual-mcp-ocata-ovs
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index 73cb2f4..cc036af 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -14,17 +14,22 @@
 - 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.bind
 - system.bind.server.single
 - system.galera.server.cluster
+- system.galera.server.database.aodh
 - system.galera.server.database.ceilometer
 - system.galera.server.database.cinder
 - system.galera.server.database.glance
@@ -39,7 +44,6 @@
   _param:
     keepalived_vip_interface: ens4
     keepalived_openstack_telemetry_vip_interface: ens4
-    linux_system_codename: xenial
   linux:
     system:
       package:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index 46f4365..749372c 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -71,6 +71,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}
@@ -96,6 +98,7 @@
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
+    keystone_aodh_password: workshop
     keystone_cinder_password: workshop
     keystone_glance_password: workshop
     keystone_heat_password: workshop
@@ -114,6 +117,7 @@
     mongodb_ceilometer_password: cloudlab
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
   linux:
     network:
       purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
index e38110b..93bfd56 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
@@ -7,7 +7,6 @@
 - cluster.virtual-mcp-ocata-ovs
 parameters:
   _param:
-    linux_system_codename: xenial
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml
index 78ef43c..44b6178 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/client.yml
@@ -1,6 +1,23 @@
 classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.virtual-mcp-ocata-ovs.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-ovs
+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
+    grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
+
+    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-ovs/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/init.yml
index b756f90..883bad0 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/init.yml
@@ -1,29 +1,15 @@
 parameters:
   _param:
     linux_system_codename: xenial
+    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-ovs/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml
index 10d7577..f1c017a 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/proxy.yml
@@ -1,13 +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-ovs
 parameters:
   _param:
-    linux_system_codename: xenial
+    nginx_proxy_grafana_port: 15013
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
index 1b84d4d..6f1b9e0 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
@@ -1,40 +1,69 @@
 classes:
-- system.collectd.remote_client.cluster
-- system.heka.remote_collector.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.container
 - system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
-- system.linux.system.repo.tcp_elastic 
+- 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-ovs
 - 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-ovs
 parameters:
   _param:
-    linux_system_codename: xenial
-    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-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml
index 37f1323..ec91ce4 100644
--- a/classes/cluster/virtual-mcp11-aio/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -3,7 +3,6 @@
 parameters:
   _param:
     linux_system_codename: xenial
-    apt_mk_version: stable
   linux:
     system:
       name: cfg01
diff --git a/classes/cluster/virtual-mcp11-aio/infra/init.yml b/classes/cluster/virtual-mcp11-aio/infra/init.yml
new file mode 100644
index 0000000..5bfe7c9
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio/infra/init.yml
@@ -0,0 +1,3 @@
+parameters:
+  _param:
+    apt_mk_version: stable
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 3482262..86627d2 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -12,6 +12,7 @@
 - system.mysql.client
 - system.memcached.server.single
 - system.rabbitmq.server.single
+- cluster.virtual-mcp11-aio.infra
 - cluster.virtual-mcp11-aio.openstack
 - cluster.overrides
 parameters:
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 0461b23..6cc6c14 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -98,7 +98,7 @@
     designate_pool_target_options:
       host: ${_param:single_address}
       port: 53
-      rndc_host: ${_param:single_address}
+      rndc_host: 127.0.0.1
       rndc_port: 953
       rndc_key_file: /etc/designate/rndc.key
     linux_system_repo: deb [arch=amd64] http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/xenial ${_param:openstack_version} main
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index be43047..693a7cb 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -15,8 +15,9 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - service.haproxy.proxy.single
+- system.influxdb.relay.cluster
 - system.influxdb.server.single
 - system.influxdb.database.prometheus
 - system.influxdb.database.ceilometer
@@ -37,6 +38,7 @@
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
     cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_local_address: ${_param:single_address}
     cluster_elasticsearch_port: 9200
     cluster_kibana_port: 5601
     cluster_node01_hostname: mon01
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 03bbc23..9e47cb3 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -15,8 +15,9 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - service.haproxy.proxy.single
+- system.influxdb.relay.cluster
 - system.influxdb.server.single
 - system.influxdb.database.prometheus
 - system.influxdb.database.ceilometer
@@ -37,6 +38,7 @@
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
     cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_local_address: ${_param:single_address}
     cluster_elasticsearch_port: 9200
     cluster_kibana_port: 5601
     cluster_node01_hostname: mon01
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 73f6dc3..a54bad3 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -48,6 +48,8 @@
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
     # Galera
     openstack_version: newton
+    galera_innodb_buffer_pool_size: 1024M
+    galera_max_connections: 200
     # Grafana
     docker_grafana_replicas: 1
     grafana_database_type: mysql
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index fc1dc29..efb1a16 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -55,6 +55,8 @@
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
     # Galera
     openstack_version: newton
+    galera_innodb_buffer_pool_size: 1024M
+    galera_max_connections: 200
     # Grafana
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 12e5170..1935ae4 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -29,6 +29,8 @@
       pkgs:
         - ${_param:kubernetes_docker_package}
         - python-docker
+      options:
+        bip: 172.31.255.1/24
   kubernetes:
     pool:
       network:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 4a6d64b..d434b72 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -9,7 +9,7 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - service.haproxy.proxy.single
 - system.galera.server.cluster
 - system.galera.server.database.grafana
@@ -17,6 +17,7 @@
 - system.glusterfs.client.volume.prometheus
 - system.glusterfs.server.cluster
 - system.glusterfs.server.volume.prometheus
+- system.influxdb.relay.cluster
 - system.influxdb.server.single
 - system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
@@ -32,6 +33,7 @@
   _param:
     cluster_public_host: mon
     cluster_vip_address: ${_param:stacklight_monitor_address}
+    cluster_local_address: ${_param:single_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
@@ -44,6 +46,8 @@
     keepalived_prometheus_vip_interface: ens4
     # Galera
     openstack_version: newton
+    galera_innodb_buffer_pool_size: 1024M
+    galera_max_connections: 200
     # Grafana
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index 66ff1f0..f62dd25 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -52,7 +52,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: prx
+            host: ${_param:openstack_control_address}
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:
diff --git a/classes/system b/classes/system
index 1b471d8..bc49d34 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 1b471d810cc0a110d9720efb7d1a55c1e0bfd8dc
+Subproject commit bc49d346f1ac5df1bae934264aa95b1dc19e596b