diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
index cafe025..6749750 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
@@ -3,6 +3,7 @@
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
+- system.openssh.server.team.stacklight
 - system.openssh.server.team.mcp_qa
 - cluster.virtual-mcp11-contrail-nfv.infra
 - cluster.virtual-mcp11-contrail-nfv.openstack
diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml
index c3e5600..6757137 100755
--- a/classes/cluster/virtual-mcp11-contrail/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -3,6 +3,7 @@
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
+- system.openssh.server.team.stacklight
 - system.openssh.server.team.mcp_qa
 - cluster.virtual-mcp11-contrail.infra
 - cluster.virtual-mcp11-contrail.openstack
diff --git a/classes/cluster/virtual-mcp11-dvr/init.yml b/classes/cluster/virtual-mcp11-dvr/init.yml
index cb8ecd2..663ac63 100644
--- a/classes/cluster/virtual-mcp11-dvr/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/init.yml
@@ -3,6 +3,7 @@
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
+- system.openssh.server.team.stacklight
 - system.openssh.server.team.mcp_qa
 - cluster.virtual-mcp11-dvr.infra
 - cluster.virtual-mcp11-dvr.openstack
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index 20e53e3..fe95334 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -9,6 +9,7 @@
 - system.openssh.server.team.mcp_qa
 - system.rsyslog.client.single
 - system.telegraf.agent
+- system.prometheus.collector
 - cluster.virtual-mcp11-k8s-calico.kubernetes
 - cluster.virtual-mcp11-k8s-calico.monitoring
 - cluster.virtual-mcp11-k8s-calico.swarm
@@ -45,17 +46,3 @@
     system:
       name: ${_param:infra_config_hostname}
       domain: ${_param:cluster_domain}
-  telegraf:
-    agent:
-      enabled: true
-      interval: 15
-      round_interval: false
-      metric_batch_size: 1000
-      metric_buffer_limit: 10000
-      collection_jitter: 2
-      output:
-        prometheus_client:
-          bind:
-            address: 0.0.0.0
-            port: 9126
-          engine: prometheus
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index 4de736d..29cc1c5 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -1,5 +1,4 @@
 classes:
-- system.linux.system.repo.mcp.salt
 - system.linux.system.repo.ubuntu
 - system.openssh.client.lab
 - system.salt.master.pkg
@@ -17,11 +16,9 @@
     reclass_data_revision: master
     reclass_config_master: ${_param:infra_config_deploy_address}
     single_address: ${_param:infra_config_address}
-    deploy_address: ${_param:infra_config_deploy_address}
     linux_system_codename: xenial
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
-    salt_master_host: ${_param:infra_config_address}
-    apt_mk_version: nightly
+    salt_master_host: ${_param:infra_config_deploy_address}
   reclass:
     storage:
       node:
@@ -31,7 +28,7 @@
           classes:
           - cluster.${_param:cluster_name}.kubernetes.compute
           params:
-            salt_master_host: ${_param:infra_config_address}
+            salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
             single_address: ${_param:kubernetes_compute_node01_address}
         kubernetes_compute_node02:
@@ -40,27 +37,52 @@
           classes:
           - cluster.${_param:cluster_name}.kubernetes.compute
           params:
-            salt_master_host: ${_param:infra_config_address}
+            salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
             single_address: ${_param:kubernetes_compute_node02_address}
         prx_node:
           name: ${_param:kubernetes_proxy_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.infra
+          - cluster.${_param:cluster_name}.monitoring.proxy
           params:
-            salt_master_host: ${_param:infra_config_address}
+            salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
             single_address: ${_param:kubernetes_proxy_node01_address}
-        mon_node:
-          name: ${_param:kubernetes_monitor_node01_hostname}
+        docker_swarm_node01:
+          name: ${_param:docker_swarm_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.infra
+          - cluster.${_param:cluster_name}.swarm.master
+          - cluster.${_param:cluster_name}.monitoring.client
+          - cluster.${_param:cluster_name}.monitoring.server
           params:
-            salt_master_host: ${_param:infra_config_address}
+            salt_master_host: ${_param:infra_config_deploy_address}
             linux_system_codename: xenial
-            single_address: ${_param:kubernetes_monitor_node01_address}
+            single_address: ${_param:docker_swarm_node01_address}
+            keepalived_vip_priority: 100
+        docker_swarm_node02:
+          name: ${_param:docker_swarm_node02_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.swarm.slave
+          - cluster.${_param:cluster_name}.monitoring.server
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:docker_swarm_node02_address}
+            keepalived_vip_priority: 101
+        docker_swarm_node03:
+          name: ${_param:docker_swarm_node03_hostname}
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.swarm.slave
+          - cluster.${_param:cluster_name}.monitoring.server
+          params:
+            salt_master_host: ${_param:infra_config_deploy_address}
+            linux_system_codename: xenial
+            single_address: ${_param:docker_swarm_node03_address}
+            keepalived_vip_priority: 102
         opencontrail_control_node01:
           params:
             rabbitmq_cluster_role: master
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 580f728..f81e996 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -1,24 +1,31 @@
 
 classes:
 - system.linux.system.single
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.ubuntu
 - system.openssh.server.team.lab
+- system.openssh.server.team.stacklight
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
+- system.rsyslog.client.single
+- system.telegraf.agent
 - cluster.virtual-mcp11-k8s-contrail.kubernetes
 - cluster.virtual-mcp11-k8s-contrail.opencontrail
+- cluster.virtual-mcp11-k8s-calico.monitoring
+- cluster.virtual-mcp11-k8s-calico.swarm
 - cluster.overwrite
 parameters:
   _param:
 
     # infra service addresses
     infra_config_hostname: cfg01
-    infra_config_address: 192.168.10.100
+    infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.100
 
     cluster_domain: virtual-mcp11-k8s-contrail.local
     cluster_name: virtual-mcp11-k8s-contrail
-    cluster_public_host: 
-
+    apt_mk_version: nightly
   linux:
     network:
       host:
@@ -27,11 +34,6 @@
           names:
           - ${_param:infra_config_hostname}
           - ${_param:infra_config_hostname}.${_param:cluster_domain}
-        cfg:
-          address: ${_param:infra_config_address}
-          names:
-          - cfg
-          - cfg.${_param:cluster_domain}
       interface:
         ens4:
           enabled: true
@@ -42,3 +44,17 @@
     system:
       name: ${_param:infra_config_hostname}
       domain: ${_param:cluster_domain}
+  telegraf:
+    agent:
+      enabled: true
+      interval: 15
+      round_interval: false
+      metric_batch_size: 1000
+      metric_buffer_limit: 10000
+      collection_jitter: 2
+      output:
+        prometheus_client:
+          bind:
+            address: 0.0.0.0
+            port: 9126
+          engine: prometheus
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 2bd905f..0bc0d40 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -31,9 +31,6 @@
     kubernetes_compute_node02_address: 172.16.10.106
     kubernetes_proxy_node01_hostname: prx01
     kubernetes_proxy_node01_address: 172.16.10.121
-    kubernetes_monitor_node01_hostname: mon01
-    kubernetes_monitor_node01_address: 172.16.10.107
-
 
     cluster_vip_address: ${_param:kubernetes_control_address}
     cluster_local_address: ${_param:single_address}
@@ -86,3 +83,8 @@
           names:
           - ${_param:kubernetes_compute_node02_hostname}
           - ${_param:kubernetes_compute_node02_hostname}.${_param:cluster_domain}
+        prx01:
+          address: ${_param:kubernetes_proxy_node01_address}
+          names:
+          - ${_param:kubernetes_proxy_node01_hostname}
+          - ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/client.yml b/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/client.yml
new file mode 100644
index 0000000..518a3da
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/client.yml
@@ -0,0 +1,16 @@
+classes:
+- 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:docker_swarm_address}
+    # Grafana client parameters
+    grafana_address: ${_param:docker_swarm_address}
+    grafana_port: 15013
+    grafana_user: admin
+    grafana_password: ${_param:grafana_admin_password}
+    grafana_prometheus_address: ${_param:docker_swarm_address}
+    grafana_prometheus_port: 15010
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/init.yml
new file mode 100644
index 0000000..96c462b
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/init.yml
@@ -0,0 +1,7 @@
+parameters:
+  _param:
+    # glusterfs
+    glusterfs_service_host: ${_param:docker_swarm_address}
+
+    # prometheus
+    prometheus_control_address: ${_param:docker_swarm_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/proxy.yml b/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/proxy.yml
new file mode 100644
index 0000000..f09e157
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/proxy.yml
@@ -0,0 +1,8 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- cluster.virtual-mcp11-k8s-calico.infra
+parameters:
+  _param:
+    cluster_public_host: ${_param:prometheus_control_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/server.yml
new file mode 100644
index 0000000..5a62ed5
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/monitoring/server.yml
@@ -0,0 +1,40 @@
+classes:
+- system.linux.system.repo.tcp_elastic
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- service.haproxy.proxy.single
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.prometheus
+- system.glusterfs.server.cluster
+- system.glusterfs.server.volume.prometheus
+- system.salt.minion.cert.prometheus_server
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.prometheus.server.target.etcd
+- system.prometheus.server.target.kubernetes
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.service.dashboard.grafana_server
+- cluster.virtual-mcp11-k8s-calico.infra
+parameters:
+  _param:
+    cluster_vip_address: ${_param:docker_swarm_address}
+    docker_image_alertmanager: alertmanager:latest
+    docker_image_pushgateway: pushgateway:latest
+    docker_image_prometheus: prometheus:latest
+    docker_image_grafana: grafana/grafana:latest
+    grafana_admin_password: admin
+    keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
+    keepalived_prometheus_vip_password: password
+    keepalived_prometheus_vip_interface: ens4
+    # Kibana
+    kibana_elasticsearch_host: ${_param:cluster_vip_address}
+    # Elasticsearch
+    cluster_node01_hostname: ${_param:docker_swarm_node01_hostname}
+    cluster_node01_address: ${_param:docker_swarm_node01_address}
+    cluster_node02_hostname: ${_param:docker_swarm_node02_hostname}
+    cluster_node02_address: ${_param:docker_swarm_node02_address}
+    cluster_node03_hostname: ${_param:docker_swarm_node03_hostname}
+    cluster_node03_address: ${_param:docker_swarm_node03_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/swarm/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/swarm/init.yml
new file mode 100644
index 0000000..f811357
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/swarm/init.yml
@@ -0,0 +1,36 @@
+parameters:
+  _param:
+    docker_swarm_hostname: mon
+    docker_swarm_address: 172.16.10.251
+    docker_swarm_node01_hostname: mon01
+    docker_swarm_node02_hostname: mon02
+    docker_swarm_node03_hostname: mon03
+    docker_swarm_node01_address: 172.16.10.107
+    docker_swarm_node02_address: 172.16.10.108
+    docker_swarm_node03_address: 172.16.10.109
+  linux:
+    network:
+      host:
+        mon:
+          address: ${_param:docker_swarm_address}
+          names:
+          - ${_param:docker_swarm_hostname}
+          - ${_param:docker_swarm_hostname}.${_param:cluster_domain}
+        mon01:
+          address: ${_param:docker_swarm_node01_address}
+          names:
+          - ${_param:docker_swarm_node01_hostname}
+          - ${_param:docker_swarm_node01_hostname}.${_param:cluster_domain}
+        mon02:
+          address: ${_param:docker_swarm_node02_address}
+          names:
+          - ${_param:docker_swarm_node02_hostname}
+          - ${_param:docker_swarm_node02_hostname}.${_param:cluster_domain}
+        mon03:
+          address: ${_param:docker_swarm_node03_address}
+          names:
+          - ${_param:docker_swarm_node03_hostname}
+          - ${_param:docker_swarm_node03_hostname}.${_param:cluster_domain}
+    system:
+      name: ${_param:infra_config_hostname}
+      domain: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/swarm/master.yml b/classes/cluster/virtual-mcp11-k8s-contrail/swarm/master.yml
new file mode 100644
index 0000000..b2d33a1
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/swarm/master.yml
@@ -0,0 +1,18 @@
+classes:
+- system.docker.client
+- system.docker.host
+- system.docker.swarm.master
+- cluster.virtual-mcp11-k8s-calico.infra
+parameters:
+  _param:
+    cluster_public_host: ${_param:docker_swarm_hostname}
+  docker:
+    client:
+      enabled: true
+      compose:
+        source:
+          engine: docker
+          image: "docker/compose:1.8.0"
+    swarm:
+      role: master
+      advertise_addr: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/swarm/slave.yml b/classes/cluster/virtual-mcp11-k8s-contrail/swarm/slave.yml
new file mode 100644
index 0000000..810da3d
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/swarm/slave.yml
@@ -0,0 +1,11 @@
+classes:
+- system.docker.host
+- system.docker.swarm.manager
+- cluster.virtual-mcp11-k8s-calico.infra
+parameters:
+  _param:
+    cluster_public_host: ${_param:docker_swarm_hostname}
+  docker:
+    swarm:
+      master:
+        host: ${_param:docker_swarm_node01_address}
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
index 8977564..0f080dc 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
@@ -4,6 +4,7 @@
 - cluster.virtual-mcp11-ovs-dpdk.openstack
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
+- system.openssh.server.team.stacklight
 - system.openssh.server.team.mcp_qa
 - cluster.virtual-mcp11-ovs-dpdk.stacklight
 - cluster.virtual-mcp11-ovs-dpdk.stacklight.client
diff --git a/classes/cluster/virtual-mcp11-ovs/init.yml b/classes/cluster/virtual-mcp11-ovs/init.yml
index 653730e..a5a1650 100644
--- a/classes/cluster/virtual-mcp11-ovs/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/init.yml
@@ -4,6 +4,7 @@
 - cluster.virtual-mcp11-ovs.openstack
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
+- system.openssh.server.team.stacklight
 - system.openssh.server.team.mcp_qa
 - cluster.virtual-mcp11-ovs.stacklight
 - cluster.virtual-mcp11-ovs.stacklight.client
diff --git a/classes/system b/classes/system
index 4350270..8850c5c 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 43502706d25ca1ed557c58a7276fcc187da4505c
+Subproject commit 8850c5c3f814ffa1f5020512ca822814dae516e0