From f6500357f0b6297bdd55a7b1466c2ca5a9b05245 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Tue, 7 Jan 2014 09:58:17 +0800
Subject: [PATCH] Add jenkins03 and 04 to most places

Add them to all the places it's safe to do so for now.  Don't actually
spin up any nodes for them yet.

Change-Id: I59e97be7e5b094af3153bc7d5dce0cff57996f55
---
 manifests/site.pp                                             | 4 ++++
 .../openstack_project/files/logstash/jenkins-log-client.yaml  | 2 ++
 modules/openstack_project/manifests/cacti.pp                  | 2 ++
 .../openstack_project/templates/nodepool/nodepool.yaml.erb    | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 079ba6ed91..095ee5065b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -454,6 +454,8 @@ node 'zuul.openstack.org' {
       'jenkins.openstack.org',
       'jenkins01.openstack.org',
       'jenkins02.openstack.org',
+      'jenkins03.openstack.org',
+      'jenkins04.openstack.org',
       'jenkins-dev.openstack.org',
     ],
   }
@@ -472,6 +474,8 @@ node 'zuul-dev.openstack.org' {
       'jenkins.openstack.org',
       'jenkins01.openstack.org',
       'jenkins02.openstack.org',
+      'jenkins03.openstack.org',
+      'jenkins04.openstack.org',
       'jenkins-dev.openstack.org',
     ],
   }
diff --git a/modules/openstack_project/files/logstash/jenkins-log-client.yaml b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
index b0aae2a955..49bef4ef31 100644
--- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml
+++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
@@ -5,6 +5,8 @@ zmq-publishers:
   - tcp://jenkins.openstack.org:8888
   - tcp://jenkins01.openstack.org:8888
   - tcp://jenkins02.openstack.org:8888
+  - tcp://jenkins03.openstack.org:8888
+  - tcp://jenkins04.openstack.org:8888
 
 # List of files to source logs from.
 source-files:
diff --git a/modules/openstack_project/manifests/cacti.pp b/modules/openstack_project/manifests/cacti.pp
index 9afb24402b..9ee3f7db8a 100644
--- a/modules/openstack_project/manifests/cacti.pp
+++ b/modules/openstack_project/manifests/cacti.pp
@@ -76,6 +76,8 @@ class openstack_project::cacti (
     'jenkins.openstack.org',
     'jenkins01.openstack.org',
     'jenkins02.openstack.org',
+    'jenkins03.openstack.org',
+    'jenkins04.openstack.org',
     'jenkins-dev.openstack.org',
     'lists.openstack.org',
     'logstash.openstack.org',
diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index cca68eb800..a3030e246d 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -9,6 +9,8 @@ cron:
 zmq-publishers:
   - tcp://jenkins01.openstack.org:8888
   - tcp://jenkins02.openstack.org:8888
+  - tcp://jenkins03.openstack.org:8888
+  - tcp://jenkins04.openstack.org:8888
 
 gearman-servers:
   - host: zuul.openstack.org