X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=ca56ab071fdb40e30a9e7d227c18cd40646e1038;hb=73898a88dbf0245dc94c3f8decac8ccbb7546391;hp=7308ca2e9e9f6d57c984934c95dff8a03dca37bf;hpb=a87fb465f5d18ab4ad353906fa63de7911b8350c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 7308ca2e9..ca56ab071 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -1,48 +1,22 @@
+# = 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-noded-v4':
-		description => 'allow ganeti-noded communication between',
-		rule        => 'proto tcp mod state state (NEW) dport (1811) @subchain \'ganeti-noded\' { saddr ($HOST_GANETI_V4) daddr ($HOST_GANETI_V4) ACCEPT; }',
-		notarule    => true,
-	}
 
-	@ferm::rule { 'dsa-ganeti-confd-v4':
-		description => 'allow ganeti-confd communication',
-		rule        => 'proto udp mod state state (NEW) dport (1814) @subchain \'ganeti-confd\' { saddr ($HOST_GANETI_V4) daddr ($HOST_GANETI_V4) ACCEPT; }',
-		notarule    => true,
-	}
-
-	@ferm::rule { 'dsa-ganeti-rapi-v4':
-		description => 'allow ganeti-rapi communication',
-		rule        => 'proto tcp mod state state (NEW) dport (5080) @subchain \'ganeti-rapi\' { saddr ($HOST_GANETI_V4) daddr ($HOST_GANETI_V4) ACCEPT; }',
-		notarule    => true,
-	}
-
-	@ferm::rule { 'dsa-drbd-v4':
-		description => 'allow drbd communication',
-		rule        => 'proto tcp mod state state (NEW) dport (11000:11999) @subchain \'drbd\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }',
-		notarule    => true,
-	}
-
-	@ferm::rule { 'dsa-ganeti-migrate':
-		description => 'allow kvm to migrate instances',
-		rule        => 'proto tcp dport 8102 @subchain \'kvm-migrate\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }',
-		notarule    => true,
-	}
+	site::linux_module { 'tun': }
 }