From 57cf0a29ab756bed55411c047ad68289a5d89c66 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Fri, 27 Jul 2018 11:27:27 +0200
Subject: [PATCH] kvm-host: install kvm-tools package instead of copying
 add-vm.sh

---
 CHANGELOG.md                | 1 +
 kvm-host/tasks/main.yml     | 9 ---------
 kvm-host/tasks/packages.yml | 1 +
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60d1853c..83aba681 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ The **patch** part changes incrementally at each release.
 * rbenv: switch from copy to lineinfile for default gems
 * squid: add a few news sites to the whitelist
 * tomcat: better nrpe check output
+* kvm-host: install kvm-tools package instead of copying add-vm.sh
 
 ### Fixed
 * evoacme: fix module detection in apache config
diff --git a/kvm-host/tasks/main.yml b/kvm-host/tasks/main.yml
index 9fc73e93..71fcda41 100644
--- a/kvm-host/tasks/main.yml
+++ b/kvm-host/tasks/main.yml
@@ -5,15 +5,6 @@
 
 - include: packages.yml
 
-- include_role:
-    name: remount-usr
-
-- name: Copy add-vm script
-  get_url:
-    url: https://forge.evolix.org/projects/kvm-tools/repository/revisions/master/raw/add-vm.sh
-    dest: /usr/share/scripts/add-vm.sh
-    mode: "0750"
-
 - include: munin.yml
 
 - include: images.yml
diff --git a/kvm-host/tasks/packages.yml b/kvm-host/tasks/packages.yml
index 7188239a..e371067f 100644
--- a/kvm-host/tasks/packages.yml
+++ b/kvm-host/tasks/packages.yml
@@ -10,3 +10,4 @@
     - virtinst
     - libvirt-daemon-system
     - libvirt-clients
+    - kvm-tools