diff --git a/nova/meta/collectd.yml b/nova/meta/collectd.yml
index ffd79de..705130b 100644
--- a/nova/meta/collectd.yml
+++ b/nova/meta/collectd.yml
@@ -9,6 +9,7 @@
 {%- endif %}
 {%- if pillar.nova.controller is defined %}
 {% from "nova/map.jinja" import controller with context %}
+{%- if controller.get('enabled', False) %}
 local_plugin:
   collectd_check_local_endpoint:
     endpoint:
@@ -32,3 +33,4 @@
     password: {{ controller.identity.password }}
     cpu_allocation_ratio: {{ controller.cpu_allocation_ratio }}
 {%- endif %}
+{%- endif %}