]> gitweb.fluxo.info Git - puppet-virtual.git/commitdiff
2.7 underscore rename
authorMicah Anderson <micah@riseup.net>
Thu, 28 Jun 2012 03:56:56 +0000 (23:56 -0400)
committerMicah Anderson <micah@riseup.net>
Thu, 28 Jun 2012 03:56:56 +0000 (23:56 -0400)
manifests/xen.pp

index 0ca5dc37e9eb5c339a8299857f73760d67d4b762..3dbb12cb743a0cc8a7d4b2957cc46f6c12cb59d6 100644 (file)
@@ -41,11 +41,11 @@ class xen::domain::base {
     }
 
     file{'/etc/xen/xend-config.sxp':
-        source => [ "puppet:///modules/site-virtual/xen/config/${fqdn}/config/xend-config.sxp",
-                    "puppet:///modules/site-virtual/xen/config/${domain}/xend-config.sxp",
-                    "puppet:///modules/site-virtual/xen/config/${operatingsystem}/xend-config.sxp",
-                    "puppet:///modules/site-virtual/xen/config/${operatingsystem}/${lsbdistcodeename}/xend-config.sxp",
-                    "puppet:///modules/site-virtual/xen/config/xend-config.sxp",
+        source => [ "puppet:///modules/site_virtual/xen/config/${fqdn}/config/xend-config.sxp",
+                    "puppet:///modules/site_virtual/xen/config/${domain}/xend-config.sxp",
+                    "puppet:///modules/site_virtual/xen/config/${operatingsystem}/xend-config.sxp",
+                    "puppet:///modules/site_virtual/xen/config/${operatingsystem}/${lsbdistcodeename}/xend-config.sxp",
+                    "puppet:///modules/site_virtual/xen/config/xend-config.sxp",
                     "puppet:///modules/virtual/xen/config/${operatingsystem}/xend-config.sxp",
                     "puppet:///modules/virtual/xen/config/xend-config.sxp" ],
         notify => Service['xend'],
@@ -149,7 +149,7 @@ class xen::dom0::debian inherits xen::dom0::base {
   file {
     "/etc/xen-tools/xen-tools.conf":
       owner => root, group => 0, mode => 0644,
-      content => template("site-virtual/xen/${operatingsystem}/${lsbdistcodename}/xen-tools.conf.erb"),
+      content => template("site_virtual/xen/${operatingsystem}/${lsbdistcodename}/xen-tools.conf.erb"),
       require => Package['xen-tools'];
   }
 }