move to puppetlabs rabbitmq module

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

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 8ebe3e70b52585163f2eb77da3dbb63319cb7ec4..86b5807a4567efb30678d8c2653e5238673e397f 100644 (file)
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -8,32 +8,27 @@ class roles::pubsub {
        $cc_secondary    = rapoport
 
        class { 'rabbitmq':
-               cluster           => true,
-               clustermembers    => [
+               config_cluster    => true,
+               cluster_nodes     => [
                        "rabbit@${cc_master}",
                        "rabbit@${cc_secondary}",
                ],
-               clustercookie     => '8r17so6o1s124ns49sr08n0o24342160',
+               cluster_node_type => 'disc',
+               erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
                delete_guest_user => true,
-               master            => $cc_master,
+               tcp_keepalive     => true,
+               ssl_only          => true,
+               ssl               => true,
+               ssl_cacert        => '/etc/ssl/debian/certs/ca.crt',
+               ssl_cert          => '/etc/ssl/debian/certs/thishost-server.crt',
+               ssl_key           => '/etc/ssl/debian/keys/thishost-server.key',
+               manage_repo       => 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)'