From 91bc60c93732e0b78749c70bc00db98d768c1685 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 26 Oct 2017 11:12:11 +1100 Subject: [PATCH] Switch zm[1-4].o.o to zuulv3 The trusty based zm[1-4].o.o hosts have been removed and we are rebuilding them as Xenial for zuulv3. This switches the config for them. Change-Id: I050ce81e3f92b475c605a079e967837c42004f9c --- manifests/site.pp | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index e9b3703f1c..c8a69a08d5 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1301,6 +1301,10 @@ node 'zuulv3.openstack.org' { 'ze08.openstack.org', 'ze09.openstack.org', 'ze10.openstack.org', + 'zm01.openstack.org', + 'zm02.openstack.org', + 'zm03.openstack.org', + 'zm04.openstack.org', 'zm05.openstack.org', 'zm06.openstack.org', 'zm07.openstack.org', @@ -1375,10 +1379,6 @@ node 'zuul.openstack.org' { 'zl04.openstack.org', 'zl05.openstack.org', 'zl06.openstack.org', - 'zm01.openstack.org', - 'zm02.openstack.org', - 'zm03.openstack.org', - 'zm04.openstack.org', ] $iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT') @@ -1459,25 +1459,8 @@ node /^zl\d+\.openstack\.org$/ { } } -# Node-OS: trusty -node /^zm0[1234].openstack\.org$/ { - $group = "zuul-merger" - class { 'openstack_project::server': - iptables_public_tcp_ports => [80], - sysadmins => hiera('sysadmins', []), - } - - class { 'openstack_project::zuul_merger': - gearman_server => 'zuul.openstack.org', - gerrit_server => 'review.openstack.org', - gerrit_user => 'jenkins', - gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'), - zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'), - } -} - # Node-OS: xenial -node /^zm0[5678].openstack\.org$/ { +node /^zm\d+.openstack\.org$/ { $group = "zuul-merger" $gerrit_server = 'review.openstack.org'