Use export/collect to get the intra-cluster firewall opened for pubsub

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

diff --git a/modules/roles/manifests/pubsub.pp b/modules/roles/manifests/pubsub.pp
index 30ae709..1312a4b 100644 (file)
--- a/modules/roles/manifests/pubsub.pp
+++ b/modules/roles/manifests/pubsub.pp
@@ -1,81 +1,43 @@
 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)'
-       }
-
-       @ferm::rule { 'rabbitmq-adm':
-               description => 'rabbitmq connections',
-               rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_IPS)'
-       }
-
-       @ferm::rule { 'rabbitmq-v6-adm':
-               domain      => 'ip6',
-               description => 'rabbitmq connections',
-               rule        => '&SERVICE_RANGE(tcp, 5671, $DSA_V6_IPS)'
-       }
-
-       if $::hostname == $cc_master {
-               $you  = '5.153.231.15'
-               $you6 = '2001:41c8:1000:21::21:15'
-       } else {
-               $you  = '5.153.231.16'
-               $you6 = '2001:41c8:1000:21::21:16'
-       }
-
-       @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"
-       }
-       @ferm::rule { 'rabbitmq_mgmt':
-               description => 'rabbitmq cluster connections',
-               rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_IPS)'
-       }
-       @ferm::rule { 'rabbitmq_mgmt_v6':
-               domain      => '(ip6)',
-               description => 'rabbitmq cluster connections',
-               rule        => '&SERVICE_RANGE(tcp, 15671, $DSA_V6_IPS)'
-       }
+  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)'
+  }
+
+  @@ferm::rule::simple { "pubsub-cluster-from-${::fqdn}":
+    tag   => 'roles::pubsub::intra-cluster',
+    saddr => $base::public_addresses,
+  }
+  Ferm::Rule::Simple <<| tag == 'roles::pubsub::intra-cluster' |>>
 }