From ec2388ef652ff83a800bd6e77524d7053fc595ea Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Wed, 16 Aug 2017 08:59:10 -0700
Subject: [PATCH] Remove zl07-zl09; add ze02-ze04

Remove configuration for some unneeded v2 launchers and replace them
with some v3 executors.

Change-Id: I1cdef87d3fde9928f9b04ee4cbf704d671c9bee0
---
 hiera/common.yaml                                           | 6 +++---
 manifests/site.pp                                           | 6 +++---
 .../files/logstash/jenkins-log-client.yaml                  | 3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index f486d15a6f..ce4a3b3393 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -469,6 +469,9 @@ cacti_hosts:
 - translate-dev.openstack.org
 - wiki.openstack.org
 - ze01.openstack.org
+- ze02.openstack.org
+- ze03.openstack.org
+- ze04.openstack.org
 - zlstatic01.openstack.org
 - zl01.openstack.org
 - zl02.openstack.org
@@ -476,9 +479,6 @@ cacti_hosts:
 - zl04.openstack.org
 - zl05.openstack.org
 - zl06.openstack.org
-- zl07.openstack.org
-- zl08.openstack.org
-- zl09.openstack.org
 - zm01.openstack.org
 - zm02.openstack.org
 - zm03.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 4cec9739fc..f953ccf8f7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1167,6 +1167,9 @@ node 'zuulv3.openstack.org' {
 
   $gearman_workers = [
     'ze01.openstack.org',
+    'ze02.openstack.org',
+    'ze03.openstack.org',
+    'ze04.openstack.org',
   ]
   $iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
 
@@ -1235,9 +1238,6 @@ node 'zuul.openstack.org' {
     'zl04.openstack.org',
     'zl05.openstack.org',
     'zl06.openstack.org',
-    'zl07.openstack.org',
-    'zl08.openstack.org',
-    'zl09.openstack.org',
     'zm01.openstack.org',
     'zm02.openstack.org',
     'zm03.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 b7b42d0919..fee5aa425b 100644
--- a/modules/openstack_project/files/logstash/jenkins-log-client.yaml
+++ b/modules/openstack_project/files/logstash/jenkins-log-client.yaml
@@ -9,9 +9,6 @@ zmq-publishers:
   - tcp://zl04.openstack.org:8888
   - tcp://zl05.openstack.org:8888
   - tcp://zl06.openstack.org:8888
-  - tcp://zl07.openstack.org:8888
-  - tcp://zl08.openstack.org:8888
-  - tcp://zl09.openstack.org:8888
 
 subunit-files:
   - name: logs/testrepository.subunit