Merge branch 'staticsync-as-a-module'

[mirror/dsa-puppet.git] / modules / ganeti2 / manifests / init.pp

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index a944f3d..20236b1 100644 (file)
--- 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':