pubsub: merge IPv4 and IPv6 rules in a single rule

[mirror/dsa-puppet.git] / modules / roles / manifests / pubsub.pp

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 3eb02d0..d165fcc 100644 (file)
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -31,32 +31,16 @@ 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)'
-       }
-
-       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)'
+               domain      => '(ip ip6)',
+               rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN)'
        }
 
        if $::hostname == $cc_master {
-               $you  = '5.153.231.15'
-               $you6 = '2001:41c8:1000:21::21:15'
+               $you  = '82.195.75.95'
+               $you6 = '2001:41b8:202:deb::311:95'
        } else {
-               $you  = '5.153.231.16'
-               $you6 = '2001:41c8:1000:21::21:16'
+               $you  = '82.195.75.94'
+               $you6 = '2001:41b8:202:deb::311:94'
        }
 
        ferm::rule { 'rabbitmq_cluster':
@@ -69,13 +53,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)'
-       }
 }