X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=2d80c9d49e21b86c8403be9aefe5b6932bb92663;hb=9768916cd03adff997b5306ed0497c31d30f2624;hp=887d448164a62a379d07a81d67319f10a4545de5;hpb=c6872f30223f23afe81c6905a061a6a5c38a22f7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 887d44816..2d80c9d49 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -1,30 +1,33 @@
+# = 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
-	}
+	site::linux_module { 'tun': }
 
-	@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,
+	file { '/etc/cron.hourly/puppet-cleanup-watcher-pause-file':
+		source => 'puppet:///modules/ganeti2/cleanup-watcher-pause-file',
+		mode    => '0555',
 	}
 
-	@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) ACCEPT; }',
-		notarule    => true,
+	if $::debarchitecture == 'arm64' {
+		file { '/usr/local/bin/qemu-system-aarch64-wrapper':
+			source => 'puppet:///modules/ganeti2/qemu-system-aarch64-wrapper',
+			mode   => '0755',
+		}
 	}
 }