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 0a6e72c..d165fcc 100644 (file)
--- 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 {