From c22a1151deb2007041b6712e0a8db0b1c65b4ee4 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 13 Oct 2017 19:58:59 -0400
Subject: [PATCH] Remove zuulv3-dev.o.o

We no longer have this server, and can remove the it from
system-config.

Change-Id: If72fce20f4f4994d46ed2652786952676912ba04
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 hiera/common.yaml |  1 -
 manifests/site.pp | 44 --------------------------------------------
 2 files changed, 45 deletions(-)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index d36bbc6c2d..0265160f3a 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -526,7 +526,6 @@ cacti_hosts:
 - zm07.openstack.org
 - zm08.openstack.org
 - zuul.openstack.org
-- zuulv3-dev.openstack.org
 - zuulv3.openstack.org
 infracloud_hpuseast_ssl_cert_file_contents: |
   -----BEGIN CERTIFICATE-----
diff --git a/manifests/site.pp b/manifests/site.pp
index f242caa2f0..7aaa095676 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -923,7 +923,6 @@ node 'nodepool.openstack.org' {
     'nb04.openstack.org',
     'nl01.openstack.org',
     'nl02.openstack.org',
-    'zuulv3-dev.openstack.org',
     'zuulv3.openstack.org',
   ]
   $zk_iptables_rule = regsubst($zk_receivers,
@@ -1302,49 +1301,6 @@ node /^ze\d+\.openstack\.org$/ {
   }
 }
 
-# Node-OS: trusty
-node 'zuulv3-dev.openstack.org' {
-  $gerrit_server        = 'review.openstack.org'
-  $gerrit_user          = 'zuul'
-  $gerrit_ssh_host_key  = hiera('gerrit_zuul_user_ssh_key_contents')
-  $zuul_ssh_private_key = hiera('zuul_ssh_private_key_contents')
-  $zuul_url             = "http://${::fqdn}/p"
-  $git_email            = 'zuul@openstack.org'
-  $git_name             = 'OpenStack Zuul'
-  $revision             = 'feature/zuulv3'
-
-  $gearman_workers = []
-  $iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
-
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80],
-    iptables_rules6           => $iptables_rules,
-    iptables_rules4           => $iptables_rules,
-    sysadmins                 => hiera('sysadmins', []),
-  }
-
-  # NOTE(pabelanger): We call ::zuul directly, so we can override all in one
-  # settings.
-  class { '::zuul':
-    gerrit_server        => $gerrit_server,
-    gerrit_user          => $gerrit_user,
-    zuul_ssh_private_key => $zuul_ssh_private_key,
-    git_email            => $git_email,
-    git_name             => $git_name,
-    revision             => $revision,
-  }
-
-  class { 'openstack_project::zuul_merger':
-    gerrit_server        => $gerrit_server,
-    gerrit_user          => $gerrit_user,
-    gerrit_ssh_host_key  => $gerrit_ssh_host_key,
-    zuul_ssh_private_key => $zuul_ssh_private_key,
-    revision             => $revision,
-    manage_common_zuul   => false,
-  }
-  # TODO(pabelanger): Add zuul_scheduler support
-}
-
 # Node-OS: xenial
 node 'zuulv3.openstack.org' {
   $gerrit_server        = 'review.openstack.org'