Make sure puppet does not mess up our ganeti

[dsa-puppet.git] / modules / ganeti2 / manifests / init.pp

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 3605b583e9cb82b5598d87493cfaa37ed871ca2c..ca56ab071fdb40e30a9e7d227c18cd40646e1038 100644 (file)
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -1,30 +1,22 @@
+# = Class: ganeti2
+#
+# Standard ganeti2 config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include ganeti2
+#
 class ganeti2 {
 
-       package { 'ganeti2':
-               ensure => installed
-       }
+       include ganeti2::params
+       include ganeti2::firewall
 
-       package { 'drbd8-utils':
-               ensure => installed
-       }
+       $drbd = $ganeti2::params::drbd
 
-       package { 'ganeti-instance-debootstrap':
+       package { 'ganeti':
                ensure => installed
        }
 
-       package { 'ganeti-htools':
-               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,
-       }
 
-       @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': }
 }