X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=c69c4d06e5363e32f2c1246963ca04d8b8e5b71c;hb=562a5017ec445c5a1fbf163b9d5a10667a9f17ea;hp=3eb02d064b5078460bd9c1e03c19637e46e7843a;hpb=29cbe59430d1e7d7d5575579b48513c56227e2f7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 3eb02d064..c69c4d06e 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -40,17 +40,6 @@ class roles::pubsub {
 		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V6)'
 	}
 
-	ferm::rule { 'rabbitmq-adm':
-		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_IPS)'
-	}
-
-	ferm::rule { 'rabbitmq-v6-adm':
-		domain      => 'ip6',
-		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_V6_IPS)'
-	}
-
 	if $::hostname == $cc_master {
 		$you  = '5.153.231.15'
 		$you6 = '2001:41c8:1000:21::21:15'
@@ -69,13 +58,4 @@ class roles::pubsub {
 		description => 'rabbitmq cluster connections',
 		rule        => "proto tcp mod state state (NEW) saddr (${you6}) ACCEPT"
 	}
-	ferm::rule { 'rabbitmq_mgmt':
-		description => 'rabbitmq cluster connections',
-		rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_IPS)'
-	}
-	ferm::rule { 'rabbitmq_mgmt_v6':
-		domain      => '(ip6)',
-		description => 'rabbitmq cluster connections',
-		rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_V6_IPS)'
-	}
 }