diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index 67ddc7f..8c8476f 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -6,6 +6,8 @@
   _param:
     heat_client_default_endpoint_type: internalURL
     heat_client_heat_endpoint_type: publicURL
+    openstack_log_appender: false
+    openstack_fluentd_handler_enabled: false
   heat:
     server:
       stack_domain_admin:
@@ -50,6 +52,13 @@
         password: ${_param:keystone_heat_password}
         endpoint_type_default: ${_param:heat_client_default_endpoint_type}
         endpoint_type_heat: ${_param:heat_client_heat_endpoint_type}
+      logging:
+        log_appender: ${_param:openstack_log_appender}
+        log_handlers:
+          watchedfile:
+            enabled: true
+          fluentd:
+            enabled: ${_param:openstack_fluentd_handler_enabled}
       message_queue:
         engine: rabbitmq
         host: ${_param:cluster_vip_address}
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 0e60d6a..79be27a 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -6,6 +6,8 @@
   _param:
     heat_client_default_endpoint_type: internalURL
     heat_client_heat_endpoint_type: publicURL
+    openstack_log_appender: false
+    openstack_fluentd_handler_enabled: false
   heat:
     server:
       stack_domain_admin:
@@ -50,6 +52,13 @@
         password: ${_param:keystone_heat_password}
         endpoint_type_default: ${_param:heat_client_default_endpoint_type}
         endpoint_type_heat: ${_param:heat_client_heat_endpoint_type}
+      logging:
+        log_appender: ${_param:openstack_log_appender}
+        log_handlers:
+          watchedfile:
+            enabled: true
+          fluentd:
+            enabled: ${_param:openstack_fluentd_handler_enabled}
       message_queue:
         engine: rabbitmq
         host: ${_param:single_address}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index e39cbbd..a2c7a62 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -3,6 +3,8 @@
     _support:
       collectd:
         enabled: true
+      fluentd:
+        enabled: true
       heka:
         enabled: true
       sensu: