See if we still need instance-debootstrap

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

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index f5032041ac59aa8dd54935403021fe82fb67a631..4dd32fee69a2177c060e2e51cda79cb0f8ae1897 100644 (file)
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -17,10 +17,6 @@ class ganeti2 {
                ensure => installed
        }
 
-       package { 'ganeti-instance-debootstrap':
-               ensure => installed
-       }
-
        if $drbd {
                package { 'drbd8-utils':
                        ensure => installed
@@ -28,53 +24,4 @@ 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',
-                       ;
-       }
-
 }