From ecf20b436b58d3b7a329823305082d49f00e76b5 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 23 Dec 2016 18:59:14 +0100
Subject: [PATCH] drbd-utils/kvm-host: store plugins in /etc/munin/plugins

Let's keep /usr alone and save our custom plugins in /etc
until we decide on a better convention.
---
 drbd-utils/tasks/munin.yml | 15 ++-------------
 kvm-host/tasks/munin.yml   | 18 +-----------------
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/drbd-utils/tasks/munin.yml b/drbd-utils/tasks/munin.yml
index e03e28e3..9bba426c 100644
--- a/drbd-utils/tasks/munin.yml
+++ b/drbd-utils/tasks/munin.yml
@@ -1,23 +1,12 @@
 ---
-- file:
-    path: '/usr/local/share/munin/plugins/'
-    state: directory
-    mode: 02755
 
 - name: Get Munin plugin
   get_url:
-    url: 'https://raw.githubusercontent.com/munin-monitoring/contrib/master/plugins/drbd/drbd'    
-    dest: '/usr/local/share/munin/plugins/'
+    url: 'https://raw.githubusercontent.com/munin-monitoring/contrib/master/plugins/drbd/drbd'
+    dest: '/etc/munin/plugins/'
     mode: 0755
   notify: restart munin-node
 
-- name: Activate Munin plugin
-  file:
-    src: "/usr/local/share/munin/plugins/drbd"
-    dest: "/etc/munin/plugins/drbd"
-    state: link
-  notify: restart munin-node
-
 - name: Copy Munin plugin conf
   copy:
     src: files/munin-plugins
diff --git a/kvm-host/tasks/munin.yml b/kvm-host/tasks/munin.yml
index 765882de..fdfe7fb4 100644
--- a/kvm-host/tasks/munin.yml
+++ b/kvm-host/tasks/munin.yml
@@ -1,14 +1,9 @@
 ---
-- name: Create Munin plugins directory
-  file:
-    path: "/usr/local/share/munin/plugins/"
-    state: directory
-    mode: 02755
 
 - name: Get Munin plugins
   get_url:
     url: "https://raw.githubusercontent.com/munin-monitoring/contrib/master/plugins/virtualization/{{ item }}"
-    dest: "/usr/local/share/munin/plugins/"
+    dest: "/etc/munin/plugins/"
     mode: 0755
   with_items:
   - kvm_cpu
@@ -16,17 +11,6 @@
   - kvm_mem
   notify: restart munin-node
 
-- name: Activate Munin plugins
-  file:
-    src: "/usr/local/share/munin/plugins/{{ item }}"
-    dest: "/etc/munin/plugins/{{ item }}"
-    state: link
-  with_items:
-  - kvm_cpu
-  - kvm_io
-  - kvm_mem
-  notify: restart munin-node
-
 - name: Copy Munin plugins conf
   copy:
     src: files/munin-plugins