X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=d165fccb596bdbda87346b55b60c32270e13cb29;hb=c744e409e7024a4c41238cc93d7f18e29ab667f6;hp=0a6e72cecf3c86828997d26d513791ae4c4dd447;hpb=5c6d90d1ea56415d05c81dee6574e4f467cd766e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 0a6e72cec..d165fccb5 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -31,13 +31,8 @@ class roles::pubsub {
 
 	ferm::rule { 'rabbitmq':
 		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V4)'
-	}
-
-	ferm::rule { 'rabbitmq-v6':
-		domain      => 'ip6',
-		description => 'rabbitmq connections',
-		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V6)'
+		domain      => '(ip ip6)',
+		rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN)'
 	}
 
 	if $::hostname == $cc_master {