diff --git a/classes/cluster/sl-k8s-calico/.env b/classes/cluster/sl-k8s-calico/.env
new file mode 100644
index 0000000..13e6475
--- /dev/null
+++ b/classes/cluster/sl-k8s-calico/.env
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja)
diff --git a/classes/cluster/sl-k8s-calico/infra/config.yml b/classes/cluster/sl-k8s-calico/infra/config.yml
index 8fbede6..88cc695 100644
--- a/classes/cluster/sl-k8s-calico/infra/config.yml
+++ b/classes/cluster/sl-k8s-calico/infra/config.yml
@@ -1,9 +1,7 @@
 classes:
-- system.docker.client
-- system.docker.host
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.docker
 - system.openssh.client.lab
 - system.salt.master.pkg
 - system.salt.minion.ca.salt_master
@@ -24,7 +22,7 @@
     single_address: ${_param:infra_config_address}
     linux_system_codename: xenial
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
-    salt_master_host: 127.0.0.1
+    salt_master_host: ${_param:infra_config_deploy_address}
   salt:
     master:
       reactor:
@@ -43,7 +41,7 @@
             salt_master_host:
               value_template: <<node_master_ip>>
         infra_config:
-          expression: <<node_hostname>>__startswith__cfg
+          expression: <<node_hostname>>__equals__cfg01
           cluster_param:
             infra_config_address:
               value_template: <<node_control_ip>>
@@ -76,24 +74,36 @@
           node_class:
             value_template:
               - cluster.<<node_cluster>>.kubernetes.compute
+          node_param:
+            deploy_address:
+              value_template: <<node_deploy_ip>>
         stacklight_monitor01:
           expression: <<node_hostname>>__equals__mon01
           cluster_param:
-            stacklight_monitor_node01_address:
+            stacklight_node01_address:
               value_template: <<node_control_ip>>
         stacklight_monitor02:
           expression: <<node_hostname>>__equals__mon02
           cluster_param:
-            stacklight_monitor_node02_address:
+            stacklight_node02_address:
               value_template: <<node_control_ip>>
         stacklight_monitor03:
           expression: <<node_hostname>>__equals__mon03
           cluster_param:
-            stacklight_monitor_node03_address:
+            stacklight_node03_address:
               value_template: <<node_control_ip>>
       node:
-        stacklight_server_node01:
-          name: ${_param:stacklight_monitor_node01_hostname}
+        prx_node:
+          name: ${_param:kubernetes_proxy_node01_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.stacklight.proxy
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:kubernetes_proxy_node01_address}
+        stacklight_node01:
+          name: ${_param:stacklight_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - service.galera.master.cluster
@@ -103,11 +113,11 @@
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:stacklight_monitor_node01_address}
+            single_address: ${_param:stacklight_node01_address}
             keepalived_vip_priority: 100
             mysql_cluster_role: master
-        stacklight_server_node02:
-          name: ${_param:stacklight_monitor_node02_hostname}
+        stacklight_node02:
+          name: ${_param:stacklight_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - service.galera.slave.cluster
@@ -116,11 +126,11 @@
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:stacklight_monitor_node02_address}
+            single_address: ${_param:stacklight_node02_address}
             keepalived_vip_priority: 101
             mysql_cluster_role: slave
-        stacklight_server_node03:
-          name: ${_param:stacklight_monitor_node03_hostname}
+        stacklight_node03:
+          name: ${_param:stacklight_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - service.galera.slave.cluster
@@ -129,7 +139,7 @@
           params:
             salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:stacklight_monitor_node03_address}
+            single_address: ${_param:stacklight_node03_address}
             keepalived_vip_priority: 102
             mysql_cluster_role: slave
 
diff --git a/classes/cluster/sl-k8s-calico/infra/init.yml b/classes/cluster/sl-k8s-calico/infra/init.yml
index b585338..270fec0 100644
--- a/classes/cluster/sl-k8s-calico/infra/init.yml
+++ b/classes/cluster/sl-k8s-calico/infra/init.yml
@@ -2,20 +2,18 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - system.rsyslog.client.single
 parameters:
-  _jenkins:
-    tests_enabled: false
   _param:
     # infra service addresses
     infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.90
 
-    cluster_domain: virtual-mcp11-k8s-calico.local
-    cluster_name: virtual-mcp11-k8s-calico
+    cluster_domain: sl-k8s-calico.local
+    cluster_name: sl-k8s-calico
     apt_mk_version: nightly
     primary_interface: ens3
   linux:
@@ -26,15 +24,6 @@
           names:
           - ${_param:infra_config_hostname}
           - ${_param:infra_config_hostname}.${_param:cluster_domain}
-      interface:
-        primary_interface:
-          enabled: true
-          type: eth
-          proto: dhcp
-          #proto: static
-          #name: ${_param:primary_interface}
-          #address: ${_param:single_address}
-          #netmask: 255.255.255.0
     system:
       name: ${_param:infra_config_hostname}
       domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl-k8s-calico/init.yml b/classes/cluster/sl-k8s-calico/init.yml
index e21b7ee..55ea734 100644
--- a/classes/cluster/sl-k8s-calico/init.yml
+++ b/classes/cluster/sl-k8s-calico/init.yml
@@ -1,5 +1,11 @@
 classes:
 - system.linux.network.dynamic_hosts
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.linux.system.repo.fluentd
 - cluster.sl-k8s-calico.kubernetes
 - cluster.sl-k8s-calico.stacklight
 - cluster.sl-k8s-calico.infra
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index ac2f555..3522796 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -1,33 +1,43 @@
 classes:
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
 - system.kubernetes.pool.cluster
-- system.linux.network.hosts
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
 - cluster.sl-k8s-calico
 parameters:
-  _param:
-    kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
-    kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
-    kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
   docker:
     host:
       pkgs:
-        - docker-engine=1.12.6-0~ubuntu-xenial
+        - ${_param:kubernetes_docker_package}
         - python-docker
+      options:
+        bip: 172.31.255.1/24
+        storage-driver: overlay2
   kubernetes:
     pool:
+      kubelet:
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
         calico:
           enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
+          mtu: ${_param:kubernetes_mtu}
           etcd:
             ssl:
               enabled: true
     common:
+      addons:
+        virtlet:
+          enabled: ${_param:kubernetes_virtlet_enabled}
+          namespace: kube-system
+          image: ${_param:kubernetes_virtlet_image}
+          criproxy_version: ${_param:kubernetes_criproxy_version}
+          criproxy_source: ${_param:kubernetes_criproxy_checksum}
+          hosts:
+          - ${_param:kubernetes_compute_node01_hostname}
+          - ${_param:kubernetes_compute_node02_hostname}
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
   linux:
@@ -37,15 +47,23 @@
           - 10.254.0.10
           - 172.18.176.4
           - 172.18.176.7
-        domain: virtual-mcp11-k8s-calico.local
-        options:
-          - ndots:5
-          - timeout:2
-          - attempts:2
       interface:
-        primary_interface:
+        ens3:
+          enabled: true
+          type: eth
+          proto: static
+          name: ${_param:primary_interface}
+          address: ${_param:deploy_address}
+          netmask: 255.255.255.0
+          gateway: 192.168.10.1
           route:
             kubernetes_services:
               address: 10.254.0.0
               netmask: 255.255.0.0
-              gateway: ${_param:single_address}
+              gateway: ${_param:deploy_address}
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: '255.255.255.0'
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index 1c0f9d1..9093496 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -1,7 +1,7 @@
 classes:
 - service.etcd.server.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.sl-k8s-calico.kubernetes.compute
@@ -24,10 +24,15 @@
   kubernetes:
     common:
       addons:
-        netchecker:
-          enabled: true
         helm:
-          enabled: true
+          enabled: ${_param:kubernetes_helm_enabled}
+        calico_policy:
+          enabled: ${_param:kubernetes_calico_policy_enabled}
+          image: ${_param:kubernetes_calico_policy_image}
+        netchecker:
+          enabled: ${_param:kubernetes_netchecker_enabled}
+          agent_image: ${_param:kubernetes_netchecker_agent_image}
+          server_image: ${_param:kubernetes_netchecker_server_image}
         coredns:
           enabled: ${_param:kubernetes_coredns_enabled}
         externaldns:
@@ -35,6 +40,8 @@
           image: ${_param:kubernetes_externaldns_image}
           provider: ${_param:kubernetes_externaldns_provider}
     master:
+      kubelet:
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
       etcd:
         ssl:
           enabled: true
@@ -46,4 +53,6 @@
               enabled: true
       namespace:
         netchecker:
-          enabled: true
+          enabled: ${_param:kubernetes_netchecker_enabled}
+      auth:
+        mode: Node,RBAC
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index d5cf684..4e03f24 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -3,6 +3,9 @@
     salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
 
+    # kubelet
+    kubelet_fail_on_swap: True
+
     # kubernetes settings
     kubernetes_admin_user: admin
     kubernetes_admin_password: sbPfel23ZigJF3Bm
@@ -12,8 +15,36 @@
     kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
     kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
     kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
+    kubernetes_mtu: 1500
+    mcp_version: testing
     etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
 
+    # docker package version
+    kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
+
+    # component docker images
+    kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
+    kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
+    kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
+    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
+    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
+    kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
+    kubernetes_virtlet_image: mirantis/virtlet:stable
+    kubernetes_criproxy_version: v0.9.4
+    kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+    kubernetes_externaldns_image: mirantis/external-dns:latest
+    kubernetes_externaldns_provider: coredns
+
+    # switches of addons
+    kubernetes_helm_enabled: true
+    kubernetes_netchecker_enabled: true
+    kubernetes_calico_policy_enabled: false
+    kubernetes_virtlet_enabled: false
+    kubernetes_coredns_enabled: false
+    kubernetes_externaldns_enabled: false
+
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
@@ -49,14 +80,6 @@
     calico_private_network: 192.168.0.0
     calico_private_netmask: 16
 
-    # component docker images
-    kubernetes_externaldns_image: mirantis/external-dns:latest
-    kubernetes_externaldns_provider: coredns
-
-    # switches of addons
-    kubernetes_coredns_enabled: false
-    kubernetes_externaldns_enabled: false
-
   linux:
     network:
       host:
@@ -96,16 +119,7 @@
           - ${_param:kubernetes_proxy_node01_hostname}
           - ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
     system:
-      rc:
-        local: |
-          #!/bin/sh -e
-          #
-          # rc.local
-          #
-          ######### This file is managed by Salt! ##########
-          # This script is executed at the end of each multiuser runlevel.
-          # Make sure that the script will "exit 0" on success or any other
-          # value on error.
-          #
-          ip r a 10.254.0.0/16 dev ens3
-          exit 0
+      user:
+        root:
+          name: root
+          password: false
diff --git a/classes/cluster/sl-k8s-calico/stacklight/client.yml b/classes/cluster/sl-k8s-calico/stacklight/client.yml
index a78a537..33b2cf0 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/client.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/client.yml
@@ -4,9 +4,6 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
-- cluster.sl-k8s-calico
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/sl-k8s-calico/stacklight/init.yml b/classes/cluster/sl-k8s-calico/stacklight/init.yml
index 2d4dc23..3910a1a 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/init.yml
@@ -1,22 +1,21 @@
 classes:
 - service.grafana.collector
 - system.linux.system.repo.mcp.extra
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
 - system.prometheus.collector
 - system.telegraf.agent
 parameters:
   _param:
     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_node01_hostname: mon01
+    stacklight_node02_hostname: mon02
+    stacklight_node03_hostname: mon03
+    stacklight_node01_address: 172.16.10.107
+    stacklight_node02_address: 172.16.10.108
+    stacklight_node03_address: 172.16.10.109
 
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
 
     mysql_admin_user: root
     mysql_admin_password: workshop
@@ -26,10 +25,15 @@
     galera_server_cluster_name: monitoring_cluster
     galera_server_maintenance_password: workshop
     galera_server_admin_password: workshop
+    galera_innodb_read_io_threads: 2
+    galera_innodb_write_io_threads: 2
+    galera_wsrep_slave_threads: 2
+    galera_xtrabackup_parallel: 1
+    galera_error_log_enabled: true
 
-    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
+    fluentd_elasticsearch_host: ${_param:stacklight_log_address}
   linux:
     network:
       host:
@@ -39,20 +43,20 @@
           - mon
           - mon.${_param:cluster_domain}
         mon01:
-          address: ${_param:stacklight_monitor_node01_address}
+          address: ${_param:stacklight_node01_address}
           names:
-          - ${_param:stacklight_monitor_node01_hostname}
-          - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_node01_hostname}
+          - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
         mon02:
-          address: ${_param:stacklight_monitor_node02_address}
+          address: ${_param:stacklight_node02_address}
           names:
-          - ${_param:stacklight_monitor_node02_hostname}
-          - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_node02_hostname}
+          - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
         mon03:
-          address: ${_param:stacklight_monitor_node03_address}
+          address: ${_param:stacklight_node03_address}
           names:
-          - ${_param:stacklight_monitor_node03_hostname}
-          - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_node03_hostname}
+          - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
     system:
       name: ${_param:infra_config_hostname}
       domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index 979b08d..61f2b6b 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -1,21 +1,21 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.influxdb
-- system.linux.system.repo.elasticsearch.5
-- system.linux.system.repo.kibana.5
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.apt_mirantis.docker
 # Needed to install Galera packages
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
-- system.haproxy.proxy.listen.stacklight.kibana
 - system.haproxy.proxy.listen.stacklight.influxdb_relay
+- system.haproxy.proxy.listen.stacklight.kibana
 - service.haproxy.proxy.single
+- system.influxdb.relay.cluster
 - 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
@@ -30,8 +30,8 @@
 parameters:
   _param:
     cluster_vip_address: ${_param:stacklight_monitor_address}
-    cluster_local_address: ${_param:single_address}
     cluster_public_host: mon
+    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
@@ -45,25 +45,28 @@
     keepalived_prometheus_vip_password: password
     keepalived_prometheus_vip_interface: ens4
     # Docker/Elasticsearch
-    cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
-    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
-    cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
-    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
+    cluster_elasticsearch_port: 9200
+    cluster_kibana_port: 5601
+    cluster_grafana_port: 3000
+    cluster_node01_hostname: ${_param:stacklight_node01_hostname}
+    cluster_node01_address: ${_param:stacklight_node01_address}
+    cluster_node02_hostname: ${_param:stacklight_node02_hostname}
+    cluster_node02_address: ${_param:stacklight_node02_address}
+    cluster_node03_hostname: ${_param:stacklight_node03_hostname}
+    cluster_node03_address: ${_param:stacklight_node03_address}
     # Kibana
     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}
     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}
@@ -72,8 +75,7 @@
     prometheus_influxdb_db: prometheus
     prometheus_influxdb_username: lma
     prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
-    rabbitmq_openstack_password: workshop
-    heka_amqp_host: ${_param:kubernetes_control_address}
+    telegraf_remote_agent_influxdb_address: ${_param:stacklight_monitor_address}
   elasticsearch:
     server:
       heap: