From d2d95bfc97ee2f20ca13b9bcaf6cb906fa533c3d Mon Sep 17 00:00:00 2001
From: Christophe Vanlancker <carroarmato0@inuits.eu>
Date: Mon, 13 Nov 2017 18:58:44 +0100
Subject: [PATCH] No need to install or manage skydive-agent or
 skydive-analyzer package, the module manages the service and configuration
 files anyway

Signed-off-by: Christophe Vanlancker <carroarmato0@inuits.eu>
---
 manifests/agent.pp            |  1 -
 manifests/analyzer.pp         |  1 -
 manifests/install/agent.pp    | 10 ----------
 manifests/install/analyzer.pp | 10 ----------
 manifests/install/web.pp      |  2 --
 5 files changed, 24 deletions(-)
 delete mode 100644 manifests/install/agent.pp
 delete mode 100644 manifests/install/analyzer.pp

diff --git a/manifests/agent.pp b/manifests/agent.pp
index 8ae96b1..2490fc7 100644
--- a/manifests/agent.pp
+++ b/manifests/agent.pp
@@ -11,7 +11,6 @@
 ) inherits ::skydive {
 
   contain ::skydive
-  contain ::skydive::install::agent
   contain ::skydive::config::agent
   contain ::skydive::service::agent
 
diff --git a/manifests/analyzer.pp b/manifests/analyzer.pp
index 5bb7b02..e75955c 100644
--- a/manifests/analyzer.pp
+++ b/manifests/analyzer.pp
@@ -20,7 +20,6 @@
   $extra_config               = {},
 ) inherits ::skydive {
 
-  contain ::skydive::install::analyzer
   contain ::skydive::config::analyzer
   contain ::skydive::service::analyzer
 
diff --git a/manifests/install/agent.pp b/manifests/install/agent.pp
deleted file mode 100644
index 01a4034..0000000
--- a/manifests/install/agent.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# class skydive::install::agent
-class skydive::install::agent {
-
-  if $::skydive::installation_type == 'package' {
-    package { 'skydive-agent':
-      ensure => $::skydive::version,
-    }
-  }
-
-}
diff --git a/manifests/install/analyzer.pp b/manifests/install/analyzer.pp
deleted file mode 100644
index 0730c0a..0000000
--- a/manifests/install/analyzer.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# class skydive::install::analyzer
-class skydive::install::analyzer {
-
-  if $::skydive::installation_type == 'package' {
-    package { 'skydive-analyzer':
-      ensure => $::skydive::version,
-    }
-  }
-
-}
diff --git a/manifests/install/web.pp b/manifests/install/web.pp
index 904cb1c..fdea772 100644
--- a/manifests/install/web.pp
+++ b/manifests/install/web.pp
@@ -15,8 +15,6 @@
 
   $skydive_packages = [
     'skydive',
-    'skydive-agent',
-    'skydive-analyzer',
   ]
 
   # Ensure Skydive packages are removed if already present