From 12c168e96e1ceefecaef9ac16b25937cc0333f22 Mon Sep 17 00:00:00 2001
From: pietro <pietro@riseup.net>
Date: Fri, 8 May 2009 02:59:08 -0700
Subject: have a sane default for xen lvm vg's

---
 manifests/xen.pp         | 7 ++++++-
 templates/xen-tools.conf | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/xen.pp b/manifests/xen.pp
index f987c8a..12a7908 100644
--- 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 7bbae21..6f5a4f9 100644
--- 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 -%>
 
 
 #
-- 
cgit v1.2.3