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 (file)
index 0000000..fa2f35e
--- /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 89096a0..33b1149 100644 (file)
--- 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":   {