diff --git a/cinder/meta/collectd.yml b/cinder/meta/collectd.yml
index 8a62dc8..ec7c9dc 100644
--- a/cinder/meta/collectd.yml
+++ b/cinder/meta/collectd.yml
@@ -1,5 +1,6 @@
 {%- if pillar.cinder.controller is defined %}
 {%- from "cinder/map.jinja" import controller with context %}
+{%- if pillar.cinder.controller.get('enabled', False) %}
 local_plugin:
   collectd_check_local_endpoint:
     endpoint:
@@ -15,3 +16,4 @@
     password: {{ controller.identity.password }}
     tenant: {{ controller.identity.tenant }}
 {%- endif %}
+{%- endif %}