commit f4527523061efca2b1cac7c99c78dfa5a2a46788
author Jenkins <jenkins@review.openstack.org> Tue Nov 08 15:02:15 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Nov 08 15:02:15 2016 +0000
tree f726d8f40d4486b892c388e222bef47251f0be7a
parent dd076e48725dac1f542861bae06e28aa7b93fa43
parent 47a6b9188d6662e9ec93e31363b376bd2aae9a76

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

nova/meta/collectd.yml

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 %}