X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=f86e580bbfd85e4407b9d151c4666b42843c924d;hb=f54c4f0e27d1ff4c0805a8b6902f0b7e1b772b19;hp=5e03c24123b4a418ba216af52f617af6c8e81a2a;hpb=821837e1e054003f4431e81da6b24639c41b2a78;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 5e03c2412..f86e580bb 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',
@@ -35,9 +35,7 @@ class ganeti2 {
 			source => 'puppet:///modules/ganeti2/crazy-multipath-restart',
 			mode   => '0555',
 		}
-		file { '/etc/cron.d/puppet-crazy-multipath-restart':
-			ensure => absent,
-		}
+		file { '/etc/cron.d/puppet-crazy-multipath-restart': ensure => absent, }
 		concat::fragment { 'dsa-puppet-stuff--multipath-restart':
 			target => '/etc/cron.d/dsa-puppet-stuff',
 			content  => @("EOF"),
@@ -45,4 +43,34 @@ class ganeti2 {
 					| 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':
+		source => 'puppet:///modules/ganeti2/ganeti-machined-register-instances',
+		mode   => '0555',
+	}
+	file { [
+		'/etc/ganeti/hooks',
+		'/etc/ganeti/hooks/instance-reboot-post.d',
+		'/etc/ganeti/hooks/instance-migrate-post.d',
+		'/etc/ganeti/hooks/instance-start-post.d',
+		'/etc/ganeti/hooks/instance-failover-post.d',
+		'/etc/ganeti/hooks/instance-add-post.d',
+		]:
+		ensure => directory,
+	}
+	file { [
+		'/etc/ganeti/hooks/instance-reboot-post.d/00-ganeti-machined-register-instances',
+		'/etc/ganeti/hooks/instance-migrate-post.d/00-ganeti-machined-register-instances',
+		'/etc/ganeti/hooks/instance-start-post.d/00-ganeti-machined-register-instances',
+		'/etc/ganeti/hooks/instance-failover-post.d/00-ganeti-machined-register-instances',
+		'/etc/ganeti/hooks/instance-add-post.d/00-ganeti-machined-register-instances',
+		]:
+		ensure => link,
+		target => '/usr/local/sbin/ganeti-machined-register-instances',
+	}
 }