From: Stephen Gran <steve@lobefin.net>
Date: Wed, 2 Dec 2009 19:21:25 +0000 (+0000)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=47968951268439eb72ff714afdb51385e900b4cd;hp=0b027a7c9c8e8dea6263757b56d7f9c5f4076d19;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
---

diff --git a/facts/servertype.rb b/facts/servertype.rb
new file mode 100644
index 000000000..fa2f35ed6
--- /dev/null
+++ b/facts/servertype.rb
@@ -0,0 +1,9 @@
+Facter.add("kvmdomain") do
+	setcode do
+		if File.new('/proc/cpuinfo').read().index('QEMU Virtual CPU')
+			result = true
+		else
+			result = false
+		end
+	end
+end
diff --git a/manifests/site.pp b/manifests/site.pp
index 89096a0a9..33b114927 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,6 +35,9 @@ node default {
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
+    case $kvmdomain {
+        "true":    { package { acpid: ensure => installed } }
+    }
 
     case $mta {
         "exim4":   {