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

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 3605b583e..4dd32fee6 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -1,30 +1,27 @@
+# = Class: ganeti2
+#
+# Standard ganeti2 config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include ganeti2
+#
 class ganeti2 {
 
-	package { 'ganeti2':
-		ensure => installed
-	}
-
-	package { 'drbd8-utils':
-		ensure => installed
-	}
+	include ganeti2::params
+	include ganeti2::firewall
 
-	package { 'ganeti-instance-debootstrap':
-		ensure => installed
-	}
+	$drbd = $ganeti2::params::drbd
 
-	package { 'ganeti-htools':
+	package { 'ganeti':
 		ensure => installed
 	}
 
-	@ferm::rule { 'dsa-ganeti-v4':
-		description => 'Allow ganeti from ganeti master',
-		rule        => 'proto tcp mod state state (NEW) dport (1811) @subchain \'ganeti\' { saddr ($HOST_GANETI_V4) ACCEPT; }',
-		notarule    => true,
+	if $drbd {
+		package { 'drbd8-utils':
+			ensure => installed
+		}
 	}
 
-	@ferm::rule { 'dsa-drbd-v4':
-		description => 'Allow ganeti from ganeti master',
-		rule        => 'proto tcp mod state state (NEW) dport (11000:11999) @subchain \'drbd\' { saddr ($HOST_DRBD_V4) daddr ($HOST_DRBD_V4) ACCEPT; }',
-		notarule    => true,
-	}
+	site::linux_module { 'tun': }
 }