diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 2dce565..df9ad6b 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,7 +2,7 @@
   neutron:
     _support:
       collectd:
-        enabled: false
+        enabled: true
       heka:
         enabled: true
       sensu:
@@ -10,4 +10,4 @@
       sphinx:
         enabled: true
       config:
-        enabled: true
\ No newline at end of file
+        enabled: true
diff --git a/neutron/files/collectd_openstack_neutron.conf b/neutron/files/collectd_openstack_neutron.conf
new file mode 100644
index 0000000..8593cdf
--- /dev/null
+++ b/neutron/files/collectd_openstack_neutron.conf
@@ -0,0 +1,10 @@
+Import "openstack_neutron"
+
+<Module "openstack_neutron">
+    KeystoneUrl "{{ plugin.url }}"
+    Username "{{ plugin.username }}"
+    Password "{{ plugin.password }}"
+    Tenant "{{ plugin.tenant }}"
+    MaxRetries "2"
+    Timeout "20"
+</Module>
diff --git a/neutron/meta/collectd.yml b/neutron/meta/collectd.yml
new file mode 100644
index 0000000..64c270d
--- /dev/null
+++ b/neutron/meta/collectd.yml
@@ -0,0 +1,12 @@
+{%- if pillar.neutron.server %}
+{%- from "neutron/map.jinja" import server with context %}
+
+remote_plugin:
+  openstack_neutron:
+    plugin: python
+    template: neutron/files/collectd_openstack_neutron.conf
+    url: "http://{{ server.identity.host }}:{{ server.identity.port }}/v{% if server.identity.get('api_version', 2)|int == 2 %}2.0{% else %}3{% endif %}"
+    username: {{ server.identity.user }}
+    password: {{ server.identity.password }}
+    tenant: {{ server.identity.tenant }}
+{%- endif %}