X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=4cbd7d5e704f182c8586d8bb60a5863ce8667397;hb=23b4b5adae9a75e3fcb27261b559b2fb497f85c3;hp=3a88f1d3832fd5a2173403e704d49284c5c65e9c;hpb=c429f34b4841fc1c41eac251fc2e9203704b1164;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 3a88f1d38..4cbd7d5e7 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -4,10 +4,6 @@ class ganeti2 {
 		ensure => installed
 	}
 
-	package { 'drbd8-utils':
-		ensure => installed
-	}
-
 	package { 'ganeti-instance-debootstrap':
 		ensure => installed
 	}
@@ -16,40 +12,48 @@ class ganeti2 {
 		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,
-	}
+	case $::cluster {
+		'ganeti2.debian.org': {
+			package { 'drbd8-utils':
+				ensure => installed
+			}
 
-	@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-noded-v4':
+				description => 'allow ganeti-noded communication',
+				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-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-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-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-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-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-drbd-v4':
+				description => 'allow ganeti drbd communication',
+				rule        => 'proto tcp mod state state (NEW) dport (11000:11999) @subchain \'ganeti-drbd\' { saddr ($HOST_GANETI_BACKEND_V4) daddr ($HOST_GANETI_BACKEND_V4) ACCEPT; }',
+				notarule    => true,
+			}
+
+			@ferm::rule { 'dsa-ganeti-kvm-migration-v4':
+				description => 'allow ganeti kvm migration ',
+				rule        => 'proto tcp dport 8102 @subchain \'ganeti-kvm-migration\' { 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,
+			@ferm::rule { 'dsa-ganeti-ssh-v4':
+				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,
+			}
+		}
 	}
 
 	file {
@@ -75,6 +79,16 @@ class ganeti2 {
 			content => template('ganeti2/instance-debootstrap/hooks/30-dsa-install-ssh-keys.erb'),
 			mode   => '0555',
 			;
+		'/etc/ganeti/instance-debootstrap/hooks/40-dsa-setup-swapfile':
+			content => template('ganeti2/instance-debootstrap/hooks/40-dsa-setup-swapfile.erb'),
+			mode   => '0555',
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/clear-root-password':
+			mode   => '0444',
+			;
+		'/etc/ganeti/instance-debootstrap/hooks/xen-hvc0':
+			mode   => '0444',
+			;
 	}
 
 }