commit 7aafaf6115a745a10e146cc5a95a1fc416493ae4
author jenkins-mk jenkins-mk <jenkins-mk@gerrit.mcp.mirantis.net> Thu Apr 13 07:13:58 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Thu Apr 13 07:13:58 2017 +0000
tree 0a9d66d856c132e79ac61c36b16afafa1c2fd85a
parent 02a01c7c6439ec6b3f0c57e855fb17968de317bb
parent 78af7a485e96617f04b8792f6bb8891457171fce

Merge "Fix configuration of collectd (lib)virt plugin"

nova/files/collectd_libvirt.conf

diff --git a/nova/files/collectd_libvirt.conf b/nova/files/collectd_libvirt.conf
index e8ba456..717eef0 100644
--- a/nova/files/collectd_libvirt.conf
+++ b/nova/files/collectd_libvirt.conf
@@ -1,8 +1,9 @@
-<LoadPlugin libvirt>
+{%- set plugin_name = "libvirt" if grains['oscodename'] == 'trusty' else 'virt' %}
+<LoadPlugin {{ plugin_name }}>
   Globals false
 </LoadPlugin>
 
-<Plugin "libvirt">
+<Plugin "{{ plugin_name }}">
   Connection "qemu:///system"
   RefreshInterval 60
   HostnameFormat "uuid"