X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=4dd32fee69a2177c060e2e51cda79cb0f8ae1897;hb=dcc47fbed7794921a5bdf89f366d6434a8ecb329;hp=bacb78cf91b704722162e6e369c952cb494d6c3c;hpb=e81d2dd357118ed7157fa2fa5107b57f28c3cdf0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index bacb78cf9..4dd32fee6 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: ganeti2
+#
+# Standard ganeti2 config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include ganeti2
+#
 class ganeti2 {
 
 	include ganeti2::params
@@ -5,15 +13,7 @@ class ganeti2 {
 
 	$drbd = $ganeti2::params::drbd
 
-	package { 'ganeti2':
-		ensure => installed
-	}
-
-	package { 'ganeti-instance-debootstrap':
-		ensure => installed
-	}
-
-	package { 'ganeti-htools':
+	package { 'ganeti':
 		ensure => installed
 	}
 
@@ -23,39 +23,5 @@ class ganeti2 {
 		}
 	}
 
-	file {
-		'/etc/ganeti/instance-debootstrap/variants.list':
-			content => template('ganeti2/instance-debootstrap/variants.list.erb'),
-			;
-		'/etc/ganeti/instance-debootstrap/variants/dsa.conf':
-			content => template('ganeti2/instance-debootstrap/variants/dsa.conf.erb'),
-			;
-		'/etc/ganeti/instance-debootstrap/hooks/00-dsa-configure-networking':
-			content => template('ganeti2/instance-debootstrap/hooks/00-dsa-configure-networking.erb'),
-			mode   => '0555',
-			;
-		'/etc/ganeti/instance-debootstrap/hooks/10-dsa-install-extra-packages':
-			content => template('ganeti2/instance-debootstrap/hooks/10-dsa-install-extra-packages.erb'),
-			mode   => '0555',
-			;
-		'/etc/ganeti/instance-debootstrap/hooks/20-dsa-install-bootloader':
-			content => template('ganeti2/instance-debootstrap/hooks/20-dsa-install-bootloader.erb'),
-			mode   => '0555',
-			;
-		'/etc/ganeti/instance-debootstrap/hooks/30-dsa-install-ssh-keys':
-			content => template('ganeti2/instance-debootstrap/hooks/30-dsa-install-ssh-keys.erb'),
-			mode   => '0555',
-			;
-		'/etc/ganeti/instance-debootstrap/hooks/40-dsa-setup-swapfile':
-			content => template('ganeti2/instance-debootstrap/hooks/40-dsa-setup-swapfile.erb'),
-			mode   => '0555',
-			;
-		'/etc/ganeti/instance-debootstrap/hooks/clear-root-password':
-			mode   => '0444',
-			;
-		'/etc/ganeti/instance-debootstrap/hooks/xen-hvc0':
-			mode   => '0444',
-			;
-	}
-
+	site::linux_module { 'tun': }
 }