Add /http-auth-jenkins/ for jenkins

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

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 86b5807a4567efb30678d8c2653e5238673e397f..9134df0658cd0995730ef98ccf43fceb2ff1c771 100644 (file)
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -10,19 +10,19 @@ class roles::pubsub {
        class { 'rabbitmq':
                config_cluster    => true,
                cluster_nodes     => [
-                       "rabbit@${cc_master}",
-                       "rabbit@${cc_secondary}",
+                       $cc_master,
+                       $cc_secondary,
                ],
                cluster_node_type => 'disc',
                erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
                delete_guest_user => true,
-               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,
+               ssl_port          => 5671,
+               ssl_verify        => 'verify_none',
+               manage_repos      => false,
        }
 
        user { 'rabbitmq':
@@ -71,11 +71,11 @@ class roles::pubsub {
        }
        @ferm::rule { 'rabbitmq_mgmt':
                description => 'rabbitmq cluster connections',
-               rule        => '&SERVICE_RANGE(tcp, 15672, $DSA_IPS)'
+               rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_IPS)'
        }
        @ferm::rule { 'rabbitmq_mgmt_v6':
                domain      => '(ip6)',
                description => 'rabbitmq cluster connections',
-               rule        => '&SERVICE_RANGE(tcp, 15672, $DSA_V6_IPS)'
+               rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_V6_IPS)'
        }
 }