X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=9134df0658cd0995730ef98ccf43fceb2ff1c771;hb=bf944940ea5403b79bb6aa927c108ec3429082dc;hp=bad9abc54169941a794f6fe2e0641eb542d7a9f3;hpb=0fdf5bc91f6e22b79896217bb83c5b105b3f74af;p=dsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index bad9abc5..9134df06 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -10,21 +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',
 		ssl_port          => 5671,
 		ssl_verify        => 'verify_none',
-		manage_repo       => false,
+		manage_repos      => false,
 	}
 
 	user { 'rabbitmq':
@@ -73,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)'
 	}
 }