From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 27 Sep 2019 22:27:38 +0000 (+0200)
Subject: pubsub: merge IPv4 and IPv6 rules in a single rule
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=c744e409e7024a4c41238cc93d7f18e29ab667f6

pubsub: merge IPv4 and IPv6 rules in a single rule
---

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 {