diff --git a/fluentd/files/input/rabbitmq.conf b/fluentd/files/input/rabbitmq.conf
new file mode 100644
index 0000000..bb6c1da
--- /dev/null
+++ b/fluentd/files/input/rabbitmq.conf
@@ -0,0 +1,28 @@
+<source>
+{% include 'fluentd/files/input/_general.conf' %}
+  tag {{ values.tag }}
+  host {{ values.host }}
+  user {{ values.user }}
+  vhost {{ values.vhost }}
+  exchange {{ values.exchange }}
+  queue {{ values.queue }}
+  routing_key {{ values.routing_key }}
+  heartbeat {{ values.get("heartbeat", 10) }}
+{%- if values.get(durable) %}
+  durable {{ values.get(durable) | lower }}
+{%- endif %}
+{%- if values.get(exclusive) %}
+  exclusive {{ values.get(exclusive) | lower }}
+{%- endif %}
+{%- if values.get(auto_delete) %}
+  auto_delete {{ values.get(auto_delete) | lower }}
+{%- endif %}
+{%- if values.get('parser') %}
+  <parse>
+{%- with values=values.get('parser') %}
+    @type {{ values.get('type') }}
+{% include 'fluentd/files/parser/' + values.get('type') + '.conf' %}
+{%- endwith %}
+  </parse>
+{%- endif %}
+</source>
diff --git a/tests/pillar/repo_tdagent.sls b/tests/pillar/repo_tdagent.sls
index 6913d7e..99e7ba3 100644
--- a/tests/pillar/repo_tdagent.sls
+++ b/tests/pillar/repo_tdagent.sls
@@ -3,8 +3,8 @@
     enabled: true
     repo:
       td-agent:
-        source: 'deb [arch=amd64] http://mirror.mirantis.com/testing/td-agent/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} contrib'
-        key_url: 'http://packages.treasuredata.com.s3.amazonaws.com/GPG-KEY-td-agent'
-      openstack-pike:
-        source: 'deb [arch=amd64] http://apt.mirantis.com/{{ grains.get('oscodename') }}/openstack/pike/ testing main'
-        key_url: 'http://apt.mirantis.com/public.gpg'
+        source: "deb [arch=amd64] http://mirror.mirantis.com/testing/td-agent/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} contrib"
+        key_url: "http://packages.treasuredata.com.s3.amazonaws.com/GPG-KEY-td-agent"
+      extra:
+        source: "deb http://mirror.mirantis.com/testing/extra/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+        key_url: "http://mirror.mirantis.com/testing/extra/{{ grains.get('oscodename') }}/archive-extra.key"