X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=ca56ab071fdb40e30a9e7d227c18cd40646e1038;hb=a459cc650774de8400f433bec40fbb1573c2cb3f;hp=3c79be08eaed93e808268f394e47ce01786b098c;hpb=a7c62e30b552b148e001c663a005cdb7ba69ce19;p=dsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 3c79be08..ca56ab07 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,70 +13,10 @@ class ganeti2 {
 
 	$drbd = $ganeti2::params::drbd
 
-	package { 'ganeti2':
+	package { 'ganeti':
 		ensure => installed
 	}
 
-	package { 'ganeti-instance-debootstrap':
-		ensure => installed
-	}
-
-	package { 'ganeti-htools':
-		ensure => installed
-	}
-
-	if $drbd {
-		package { 'drbd8-utils':
-			ensure => installed
-		}
-	}
-
-	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',
-			;
-	}
 
+	site::linux_module { 'tun': }
 }