From: Micah Anderson <micah@riseup.net>
Date: Wed, 15 Dec 2010 18:13:20 +0000 (-0500)
Subject: enable site-virtual source distribution of xend-config.sxp
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=620f972db89ec6891693e1b01de128c81d1764b9;p=puppet-virtual.git

enable site-virtual source distribution of xend-config.sxp
---

diff --git a/manifests/xen.pp b/manifests/xen.pp
index 301b316..de07f19 100644
--- a/manifests/xen.pp
+++ b/manifests/xen.pp
@@ -41,13 +41,11 @@ class xen::domain::base {
     }
 
     file{'/etc/xen/xend-config.sxp':
-        source => [ "puppet://$server/files/virtual/xen/${fqdn}/config/xend-config.sxp",
-                    "puppet://$server/files/virtual/xen/config/${domain}/xend-config.sxp",
-                    "puppet://$server/files/virtual/xen/config/${operatingsystem}/xend-config.sxp",
-                    "puppet://$server/files/virtual/xen/config/${operatingsystem}/$lsbdistcodename/xend-config.sxp",
-                    "puppet://$server/files/virtual/xen/config/xend-config.sxp",
+        source => [ "puppet://$server/modules/site-virtual/xen/${fqdn}/config/xend-config.sxp",
+                    "puppet://$server/modules/site-virtual/xen/config/${domain}/xend-config.sxp",
+                    "puppet://$server/modules/site-virtual/xen/config/${operatingsystem}/xend-config.sxp",
+                    "puppet://$server/modules/site-virtual/xen/config/xend-config.sxp",
                     "puppet://$server/modules/virtual/xen/config/${operatingsystem}/xend-config.sxp",
-                    "puppet://$server/modules/virtual/xen/config/${operatingsystem}/$lsbdistcodename/xend-config.sxp",
                     "puppet://$server/modules/virtual/xen/config/xend-config.sxp" ],
         notify => Service['xend'],
         owner => root, group => 0, mode => 0644;