the package got renamed from ganeti2 to ganeti

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

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 743a29d..33f9c21 100644 (file)
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -5,7 +5,7 @@ class ganeti2 {
 
        $drbd = $ganeti2::params::drbd
 
-       package { 'ganeti2':
+       package { 'ganeti':
                ensure => installed
        }
 
@@ -23,40 +23,52 @@ class ganeti2 {
                }
        }
 
+       site::linux_module { 'tun': }
+
        file {
                '/etc/ganeti/instance-debootstrap/variants.list':
                        content => template('ganeti2/instance-debootstrap/variants.list.erb'),
+                       require => Package['ganeti-instance-debootstrap'],
                        ;
                '/etc/ganeti/instance-debootstrap/variants/dsa.conf':
                        content => template('ganeti2/instance-debootstrap/variants/dsa.conf.erb'),
+                       require => Package['ganeti-instance-debootstrap'],
                        ;
                '/etc/ganeti/instance-debootstrap/variants/dsa-wheezy.conf':
                        content => template('ganeti2/instance-debootstrap/variants/dsa-wheezy.conf.erb'),
+                       require => Package['ganeti-instance-debootstrap'],
                        ;
                '/etc/ganeti/instance-debootstrap/hooks/00-dsa-configure-networking':
                        content => template('ganeti2/instance-debootstrap/hooks/00-dsa-configure-networking.erb'),
+                       require => Package['ganeti-instance-debootstrap'],
                        mode   => '0555',
                        ;
                '/etc/ganeti/instance-debootstrap/hooks/10-dsa-install-extra-packages':
                        content => template('ganeti2/instance-debootstrap/hooks/10-dsa-install-extra-packages.erb'),
+                       require => Package['ganeti-instance-debootstrap'],
                        mode   => '0555',
                        ;
                '/etc/ganeti/instance-debootstrap/hooks/20-dsa-install-bootloader':
                        content => template('ganeti2/instance-debootstrap/hooks/20-dsa-install-bootloader.erb'),
+                       require => Package['ganeti-instance-debootstrap'],
                        mode   => '0555',
                        ;
                '/etc/ganeti/instance-debootstrap/hooks/30-dsa-install-ssh-keys':
                        content => template('ganeti2/instance-debootstrap/hooks/30-dsa-install-ssh-keys.erb'),
+                       require => Package['ganeti-instance-debootstrap'],
                        mode   => '0555',
                        ;
                '/etc/ganeti/instance-debootstrap/hooks/40-dsa-setup-swapfile':
                        content => template('ganeti2/instance-debootstrap/hooks/40-dsa-setup-swapfile.erb'),
+                       require => Package['ganeti-instance-debootstrap'],
                        mode   => '0555',
                        ;
                '/etc/ganeti/instance-debootstrap/hooks/clear-root-password':
+                       require => Package['ganeti-instance-debootstrap'],
                        mode   => '0444',
                        ;
                '/etc/ganeti/instance-debootstrap/hooks/xen-hvc0':
+                       require => Package['ganeti-instance-debootstrap'],
                        mode   => '0444',
                        ;
        }