X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fpubsub.pp;h=8ebe3e70b52585163f2eb77da3dbb63319cb7ec4;hb=5a8b3ee0b8fbf27d1106dd2defd757cd412f2453;hp=2f02be0d329403e57da2d2c08f3f41bc9ce8f533;hpb=62823a752e52be5f80185c80e2e0298cb6f75398;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 2f02be0d3..8ebe3e70b 100644
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -57,16 +57,23 @@ class roles::pubsub {
 	}
 
 	if $::hostname == $cc_master {
-		$you = $cc_secondary
+		$you  = '5.153.231.15'
+		$you6 = '2001:41c8:1000:21::21:15'
 	} else {
-		$you = $cc_master
+		$you  = '5.153.231.16'
+		$you6 = '2001:41c8:1000:21::21:16'
 	}
 
 	@ferm::rule { 'rabbitmq_cluster':
-		domain      => '(ip ip6)',
+		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"
+	}
 	@ferm::rule { 'rabbitmq_mgmt':
 		description => 'rabbitmq cluster connections',
 		rule        => '&SERVICE_RANGE(tcp, 15672, $DSA_IPS)'