From: Paul Wise <pabs@debian.org>
Date: Tue, 10 Nov 2015 02:39:53 +0000 (+0800)
Subject: Always remove acpi packages from jessie hosts
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=HEAD

Always remove acpi packages from jessie hosts
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 3ccacfe0..5b95b0c6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -71,9 +71,7 @@ node default {
 
 	if $::kernel == Linux {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index 91aceaf0..feadbe35 100644
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -8,7 +8,7 @@ class acpi {
 			package { 'acpi-support-base':
 				ensure => purged
 			}
-		} else {
+		} elsif ($::kvmdomain) {
 			package { 'acpid':
 				ensure => installed
 			}