From 247d0420a7d4f86809c6c7d49c7ba2b76f9ca8f3 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Tue, 10 Nov 2015 10:39:53 +0800 Subject: [PATCH] Always remove acpi packages from jessie hosts --- manifests/site.pp | 4 +--- modules/acpi/manifests/init.pp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) 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 } -- 2.39.2