From bb976ef1da3b1b4a970c1413b15c21992b78760d Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 30 Nov 2017 12:51:24 -0500
Subject: [PATCH] Add zk01-03 servers to cluster zookeeper

As part of the migration to ubuntu-xenial, create a new zookeeper
cluster which allows us to migrate out live data from nodepool.o.o.

This commit doesn't open the ports on nodepool.o.o just yet, but
should allow our 3 zookeeper servers to obtain quorum.

Change-Id: Iaca6015bb063cca452d0dc6c390dc6dcf55148f9
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 hiera/common.yaml |  3 +++
 manifests/site.pp | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index fedf63d282..67d7dd06be 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -488,6 +488,9 @@ cacti_hosts:
 - ze08.openstack.org
 - ze09.openstack.org
 - ze10.openstack.org
+- zk01.openstack.org
+- zk02.openstack.org
+- zk03.openstack.org
 - zm01.openstack.org
 - zm02.openstack.org
 - zm03.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 955594915f..ced2bf0927 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -797,6 +797,47 @@ node 'static.openstack.org' {
   }
 }
 
+# Node-OS: xenial
+node /^zk\d+\.openstack\.org$/ {
+  $zk_receivers = [
+    'nb03.openstack.org',
+    'nb04.openstack.org',
+    'nl01.openstack.org',
+    'nl02.openstack.org',
+    'zuulv3.openstack.org',
+  ]
+
+  $zk_cluster_members = [
+    'zk01.openstack.org',
+    'zk02.openstack.org',
+    'zk03.openstack.org',
+  ]
+
+  $zk_receiver_rule = regsubst($zk_receivers,
+                               '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 2181 -s \1 -j ACCEPT')
+  $zk_election_rule = regsubst($zk_cluster_members,
+                               '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 2888 -s \1 -j ACCEPT')
+  $zk_leader_rule = regsubst($zk_cluster_members,
+                             '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 3889 -s \1 -j ACCEPT')
+  $iptables_rule = flatten([$zk_receiver_rule, $zk_election_rule, $zk_leader_rule])
+  class { 'openstack_project::server':
+    iptables_rules6           => $iptables_rule,
+    iptables_rules4           => $iptables_rule,
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
+  class { '::zookeeper':
+    id             => $::fqdn,
+    # The frequency in hours to look for and purge old snapshots,
+    # defaults to 0 (disabled). The number of retained snapshots can
+    # be separately controlled through snap_retain_count and
+    # defaults to the minimum value of 3. This will quickly fill the
+    # disk in production if not enabled. Works on ZK >=3.4.
+    purge_interval => 6,
+    servers        => $zk_cluster_members,
+  }
+}
+
 # A machine to serve various project status updates.
 # Node-OS: trusty
 node 'status.openstack.org' {