have a sane default for xen lvm vg's

diff --git a/manifests/xen.pp b/manifests/xen.pp
index f987c8a9a51783617f2114f26c7e112000ce6f10..12a7908f33498a4a37512a965f5374c978c384c8 100644 (file)
--- a/manifests/xen.pp
+++ b/manifests/xen.pp
@@ -117,6 +117,10 @@ class xen::dom0::centos inherits xen::dom0::base {
 }
 
 class xen::dom0::debian inherits xen::dom0::base {
+  $real_xen_lvm => $xen_lvm ? {
+    '' => "vg0_${hostname}",
+    default => $xen_lvm,
+  } 
   case $lsbdistcodename {
     lenny: {
       package {
@@ -129,6 +133,7 @@ class xen::dom0::debian inherits xen::dom0::base {
   file {
     "/etc/xen-tools/xen-tools.conf":
       owner => root, group => 0, mode => 0644,
-      content => template("virtual/xen-tools.conf");
+      content => template("virtual/xen-tools.conf"),
+      require => Package['xen-tools'];
   }
 }

diff --git a/templates/xen-tools.conf b/templates/xen-tools.conf
index 7bbae218b379f443e9f2cec62c85d4a5e09356d4..6f5a4f9c52f11bd1b8ae9b5cd152c93a0b1d7b4c 100644 (file)
--- a/templates/xen-tools.conf
+++ b/templates/xen-tools.conf
@@ -52,7 +52,7 @@
 # LVM volume group here instead
 #
 ##
-lvm = <% xen_lvm -%>
+lvm = <% real_xen_lvm -%>
 
 
 #