X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=460066517a69b08c8a8cecdd8e2d022aa309b2ae;hb=c29dc7240f2a85411bd1acb7fb14756251f56109;hp=0a6e72cecf3c86828997d26d513791ae4c4dd447;hpb=16f159df93f2125246d86d82d5ce4976e36ab66c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 0a6e72cec..460066517 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -1,61 +1,49 @@
 class roles::pubsub {
-	include roles::pubsub::params
-	include roles::pubsub::entities
-
-	$cluster_cookie  = $roles::pubsub::params::cluster_cookie
-
-	$cc_master       = rainier
-	$cc_secondary    = rapoport
-
-	class { 'rabbitmq':
-		config_cluster    => true,
-		cluster_nodes     => [
-			$cc_master,
-			$cc_secondary,
-		],
-		cluster_node_type => 'disc',
-		erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
-		delete_guest_user => true,
-		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'
-	}
-
-	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)'
-	}
-
-	if $::hostname == $cc_master {
-		$you  = '82.195.75.95'
-		$you6 = '2001:41b8:202:deb::311:95'
-	} else {
-		$you  = '82.195.75.94'
-		$you6 = '2001:41b8:202:deb::311:94'
-	}
-
-	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':
-		domain      => 'ip6',
-		description => 'rabbitmq cluster connections',
-		rule        => "proto tcp mod state state (NEW) saddr (${you6}) ACCEPT"
-	}
+  include roles::pubsub::params
+  include roles::pubsub::entities
+
+  $cluster_cookie  = $roles::pubsub::params::cluster_cookie
+
+  $cc_master       = rainier
+  $cc_secondary    = rapoport
+
+  class { 'rabbitmq':
+    config_cluster    => true,
+    cluster_nodes     => [
+      $cc_master,
+      $cc_secondary,
+    ],
+    cluster_node_type => 'disc',
+    erlang_cookie     => '8r17so6o1s124ns49sr08n0o24342160',
+    delete_guest_user => true,
+    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'
+  }
+
+  ferm::rule { 'rabbitmq':
+    description => 'rabbitmq connections',
+    domain      => '(ip ip6)',
+    rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN)'
+  }
+
+  if $::hostname == $cc_master {
+    $other = join(getfromhash($deprecated::allnodeinfo, "${cc_secondary}.debian.org", 'ipHostNumber'), ' ')
+  } else {
+    $other = join(getfromhash($deprecated::allnodeinfo, "${cc_master}.debian.org", 'ipHostNumber'), ' ')
+  }
+
+  ferm::rule { 'rabbitmq_cluster':
+    domain      => '(ip ip6)',
+    description => 'rabbitmq cluster connections',
+    rule        => "proto tcp mod state state (NEW) saddr (${other}) ACCEPT"
+  }
 }