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

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index a944f3db0..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',
@@ -36,13 +36,17 @@ class ganeti2 {
 			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
 		}
 	}
+	file { '/usr/local/sbin/ganeti-reboot-cluster':
+		source => 'puppet:///modules/ganeti2/ganeti-reboot-cluster',
+		mode   => '0555',
+	}
 
 	package { ['python-dbus', 'systemd-container']: ensure => installed }
 	file { '/usr/local/sbin/ganeti-machined-register-instances':