X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=20236b1e4e7c0f1f6497cb34f71d03c01bf02891;hb=3e5945324a388a3b0b4ac6bff81a88c30bba0fcf;hp=3fb944cd9bf3b1ce7ca390bf1079c74ba8f0acb0;hpb=b3110a86f05f02946c0c36ad43418b78092851e2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 3fb944cd9..20236b1e4 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -17,7 +17,7 @@ class ganeti2 {
 		ensure => installed
 	}
 
-	site::linux_module { 'tun': }
+	base::linux_module { 'tun': }
 
 	file { '/etc/cron.hourly/puppet-cleanup-watcher-pause-file':
 		source => 'puppet:///modules/ganeti2/cleanup-watcher-pause-file',
@@ -30,21 +30,14 @@ class ganeti2 {
 			mode   => '0555',
 		}
 	}
-	if $::debarchitecture == 'ppc64el' {
-		file { '/usr/local/bin/qemu-system-ppc64-wrapper':
-			source => 'puppet:///modules/ganeti2/qemu-system-ppc64-wrapper',
-			mode   => '0555',
-		}
-	}
-
 	if $::cluster == 'ganeti.bm.debian.org' {
 		file { '/usr/local/sbin/crazy-multipath-restart':
 			source => 'puppet:///modules/ganeti2/crazy-multipath-restart',
 			mode   => '0555',
 		}
 		file { '/etc/cron.d/puppet-crazy-multipath-restart': ensure => absent, }
-		concat::fragment { 'dsa-puppet-stuff--multipath-restart':
-			target => '/etc/cron.d/dsa-puppet-stuff',
+		concat::fragment { 'puppet-crontab--multipath-restart':
+			target => '/etc/cron.d/puppet-crontab',
 			content  => @("EOF"),
 					*/15 * * * * root /usr/local/sbin/crazy-multipath-restart
 					| EOF