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

@@ -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

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',

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