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 8ebe3e7..d165fcc 100644 (file)
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -8,79 +8,49 @@ class roles::pubsub {
        $cc_secondary    = rapoport
 
        class { 'rabbitmq':
-               cluster           => true,
-               clustermembers    => [
-                       "rabbit@${cc_master}",
-                       "rabbit@${cc_secondary}",
+               config_cluster    => true,
+               cluster_nodes     => [
+                       $cc_master,
+                       $cc_secondary,
                ],
-               clustercookie     => '8r17so6o1s124ns49sr08n0o24342160',
+               cluster_node_type => 'disc',
+               erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
                delete_guest_user => true,
-               master            => $cc_master,
+               ssl               => true,
+               ssl_cacert        => '/etc/ssl/debian/certs/ca.crt',
+               ssl_cert          => '/etc/ssl/debian/certs/thishost-server.crt',
+               ssl_key           => '/etc/ssl/private/thishost-server.key',
+               ssl_port          => 5671,
+               ssl_verify        => 'verify_none',
+               repos_ensure      => false,
        }
 
        user { 'rabbitmq':
                groups => 'ssl-cert'
        }
 
-       concat::fragment { 'rabbit_ssl':
-               target => '/etc/rabbitmq/rabbitmq.config',
-               order  => 35,
-               source => 'puppet:///modules/roles/pubsub/rabbitmq.config'
-       }
-
-       concat::fragment { 'rabbit_mgmt_ssl':
-               target => '/etc/rabbitmq/rabbitmq.config',
-               order  => 55,
-               source => 'puppet:///modules/roles/pubsub/rabbitmq-mgmt.config'
-       }
-
-       @ferm::rule { 'rabbitmq':
-               description => 'rabbitmq connections',
-               rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V4)'
-       }
-
-       @ferm::rule { 'rabbitmq-v6':
-               domain      => 'ip6',
+       ferm::rule { 'rabbitmq':
                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':
+       ferm::rule { 'rabbitmq_cluster':
                domain      => 'ip',
                description => 'rabbitmq cluster connections',
                rule        => "proto tcp mod state state (NEW) saddr (${you}) ACCEPT"
        }
-       @ferm::rule { 'rabbitmq_cluster_v6':
+       ferm::rule { 'rabbitmq_cluster_v6':
                domain      => 'ip6',
                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, 15672, $DSA_IPS)'
-       }
-       @ferm::rule { 'rabbitmq_mgmt_v6':
-               domain      => '(ip6)',
-               description => 'rabbitmq cluster connections',
-               rule        => '&SERVICE_RANGE(tcp, 15672, $DSA_V6_IPS)'
-       }
 }