X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fganeti2%2Fmanifests%2Finit.pp;h=7d44ee1da596a57c59b961f966069a38193e80dd;hb=ed99f27a1a047466ef2f0fa56ae42640a3a78fec;hp=3605b583e9cb82b5598d87493cfaa37ed871ca2c;hpb=83f14aaf89b77bb64cac65f9c455062bd3fc4c74;p=dsa-puppet.git

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index 3605b583..7d44ee1d 100644
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -16,15 +16,39 @@ class ganeti2 {
 		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; }',
+	@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 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; }',
+		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,
 	}
 }