commit faee397b643b96c0aa106e5bc9c1f9adf3016693
author Jenkins <jenkins@review.openstack.org> Tue Nov 08 15:01:21 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Nov 08 15:01:21 2016 +0000
tree 52e0abed5592a017c15efe050ce06e73ba83744b
parent d3abcff5cc0748b7cf714b42e1fa1dd6a7074522
parent 007973a9d17f498d072313d45266e7fea2bbfa04

Merge "Fix collectd meta when the service is disabled" into stacklight

neutron/meta/collectd.yml

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