store ssh auth key snippets for buildd wb and upload access, but do not collect just yet

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

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 3fb944c..f86e580 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',
@@ -30,13 +30,6 @@ 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',