X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=f5032041ac59aa8dd54935403021fe82fb67a631;hb=47e9ce49040948746aa82436b8b8646a741d366e;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..f5032041a 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,7 +13,7 @@ class ganeti2 {
 
 	$drbd = $ganeti2::params::drbd
 
-	package { 'ganeti2':
+	package { 'ganeti':
 		ensure => installed
 	}
 
@@ -13,48 +21,59 @@ class ganeti2 {
 		ensure => installed
 	}
 
-	package { 'ganeti-htools':
-		ensure => installed
-	}
-
 	if $drbd {
 		package { 'drbd8-utils':
 			ensure => installed
 		}
 	}
 
+	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'),
-			mode   => '0555',
+			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'),
-			mode   => '0555',
+			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'),
-			mode   => '0555',
+			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'),
-			mode   => '0555',
+			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'),
-			mode   => '0555',
+			require => Package['ganeti-instance-debootstrap'],
+			mode    => '0555',
 			;
 		'/etc/ganeti/instance-debootstrap/hooks/clear-root-password':
-			mode   => '0444',
+			require => Package['ganeti-instance-debootstrap'],
+			mode    => '0444',
 			;
 		'/etc/ganeti/instance-debootstrap/hooks/xen-hvc0':
-			mode   => '0444',
+			require => Package['ganeti-instance-debootstrap'],
+			mode    => '0444',
 			;
 	}