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 7d44ee1da596a57c59b961f966069a38193e80dd..ca56ab071fdb40e30a9e7d227c18cd40646e1038 100644 (file)
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -1,54 +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-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 \'ganeti-migrate\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }',
-               notarule    => true,
-       }
-
-       @ferm::rule { 'dsa-ganeti-ssh':
-               description => 'allow ganeti to ssh around',
-               rule        => 'proto tcp dport ssh @subchain \'ganeti-ssh\' { saddr ( $HOST_GANETI_V4 $HOST_GANETI_BACKEND_V4) ACCEPT; }',
-               notarule    => true,
-       }
+       site::linux_module { 'tun': }
 }