From b1ead43061382213d9a1eb6eb95815672cf3d4c9 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 21 Feb 2018 08:02:20 +1100
Subject: [PATCH] Add nb03 matching, firewall and monitoring

Turn the nb match into a generic "nb\d+" match to facilitate new
hosts.

Add nb03 to firewalls and hiera.

This is planned to be a linaro-based arm64 builder

Depends-On: https://review.openstack.org/546465
Change-Id: I417784263d231b3d05c64dee72def01d7733a26b
---
 hiera/common.yaml | 1 +
 manifests/site.pp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index 03d168b477..4bd762a206 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -478,6 +478,7 @@ cacti_hosts:
 - logstash.openstack.org
 - nb01.openstack.org
 - nb02.openstack.org
+- nb03.openstack.org
 - nl01.openstack.org
 - nl02.openstack.org
 - nl03.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 3a4b024c6c..dcb06d99bf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -788,6 +788,7 @@ node /^zk\d+\.openstack\.org$/ {
       # Zookeeper clients
       {protocol => 'tcp', port => '2181', hostname => 'nb01.openstack.org'},
       {protocol => 'tcp', port => '2181', hostname => 'nb02.openstack.org'},
+      {protocol => 'tcp', port => '2181', hostname => 'nb03.openstack.org'},
       {protocol => 'tcp', port => '2181', hostname => 'nl01.openstack.org'},
       {protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
       {protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
@@ -934,6 +935,7 @@ node 'nodepool.openstack.org' {
     iptables_allowed_hosts    => [
       {protocol => 'tcp', port => '2181', hostname => 'nb01.openstack.org'},
       {protocol => 'tcp', port => '2181', hostname => 'nb02.openstack.org'},
+      {protocol => 'tcp', port => '2181', hostname => 'nb03.openstack.org'},
       {protocol => 'tcp', port => '2181', hostname => 'nl01.openstack.org'},
       {protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
       {protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
@@ -1068,7 +1070,7 @@ node /^nl\d+\.openstack\.org$/ {
 }
 
 # Node-OS: xenial
-node /^nb0[12].openstack\.org$/ {
+node /^nb\d+\.openstack\.org$/ {
   $group = 'nodepool'
   # TODO(pabelanger): Move all of this back into nodepool manifest, it has
   # grown too big.