diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
index e138b42..5a8072e 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 1367d18..f5600aa 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -17,14 +17,14 @@
 - system.keystone.client.service.cinder3
 - system.keystone.client.service.designate
 - system.mysql.client.single
-#- system.reclass.storage.system.openstack_dns_cluster
+- system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
-#- system.reclass.storage.system.openstack_compute_multi
-#- system.reclass.storage.system.openstack_gateway_single
-#- system.reclass.storage.system.openstack_dashboard_single
-#- system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.stacklightv2_server_cluster
 - cluster.virtual-mcp-pike-dvr-ssl.openstack.proxy
-#- cluster.virtual-mcp-pike-dvr-ssl.stacklight.proxy
+- cluster.virtual-mcp-pike-dvr-ssl.stacklight.proxy
 - cluster.virtual-mcp-pike-dvr-ssl
 parameters:
   _param:
@@ -161,26 +161,26 @@
           params:
             mysql_cluster_role: slave
             linux_system_codename: xenial
-#        stacklight_server_node01:
-#          classes:
-#          - system.influxdb.server.single
-#          - system.influxdb.database.stacklight
-#        openstack_compute_node01:
-#          params:
-#            single_address: 172.16.10.105
-#            tenant_address: 10.1.0.105
-#            external_address: 10.16.0.105
-#        openstack_compute_node02:
-#          params:
-#            single_address: 172.16.10.106
-#            tenant_address: 10.1.0.106
-#            external_address: 10.16.0.106
-#        openstack_gateway_node01:
-#          params:
-#            tenant_address: 10.1.0.110
-#            external_address: 10.16.0.110
-#        openstack_proxy_node01:
-#          classes:
-#          - cluster.virtual-mcp-pike-dvr-ssl.openstack.proxy
-#          params:
-#            linux_system_codename: xenial
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
+        openstack_compute_node01:
+          params:
+            single_address: 172.16.10.105
+            tenant_address: 10.1.0.105
+            external_address: 10.16.0.105
+        openstack_compute_node02:
+          params:
+            single_address: 172.16.10.106
+            tenant_address: 10.1.0.106
+            external_address: 10.16.0.106
+        openstack_gateway_node01:
+          params:
+            tenant_address: 10.1.0.110
+            external_address: 10.16.0.110
+        openstack_proxy_node01:
+          classes:
+          - cluster.virtual-mcp-pike-dvr-ssl.openstack.proxy
+          params:
+            linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
index 6075456..9d49da0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
@@ -1,10 +1,14 @@
 classes:
 - system.linux.network.dynamic_hosts
 - service.grafana.collector
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
+- 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.mcp.extra
 - system.linux.system.single
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
 - system.rsyslog.client.single
 - system.prometheus.collector
 - system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
index a2e9e3a..23ea919 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -24,11 +24,6 @@
   nova:
     compute:
       vncproxy_url: http://${_param:cluster_vip_address}:6080
-#      message_queue:
-#        members:
-#          - host: ${_param:openstack_control_node01_address}
-#          - host: ${_param:openstack_control_node02_address}
-#          - host: ${_param:openstack_control_node03_address}
       notification:
         driver: messagingv2
         topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index b370655..e7f48a6 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -1,5 +1,4 @@
 classes:
-#- system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.linux.system.lowmem
 - system.linux.system.repo.mcp.apt_mirantis.glusterfs
@@ -42,7 +41,6 @@
 - system.galera.server.database.nova
 - system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
-- cluster.virtual-mcp-pike-dvr-ssl.openstack.dns
 - cluster.virtual-mcp-pike-dvr-ssl
 
 parameters:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/dns.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/dns.yml
index 8badcc2..cb61189 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/dns.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/dns.yml
@@ -25,11 +25,11 @@
       package:
         python-msgpack:
           version: latest
-#    network:
-#      interface:
-#        ens4:
-#          enabled: true
-#          type: eth
-#          proto: static
-#          address: ${_param:single_address}
-#          netmask: 255.255.255.0
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index c3efc9a..94e135b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -175,6 +175,8 @@
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
     ceilometer_influxdb_password: lmapass
+    openstack_log_appender: true
+    openstack_fluentd_handler_enabled: true
   linux:
     network:
       purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/init.yml
index 0b10c03..015ea27 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/stacklight/init.yml
@@ -9,6 +9,7 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:openstack_database_address}
     grafana_database_password: ${_param:mysql_grafana_password}
+    fluentd_elasticsearch_host: ${_param:stacklight_log_address}
   linux:
     network:
       host: