From 2fc05efafa3d0e437bc5d177a7c593dbf551fa12 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Sun, 10 Sep 2017 13:57:57 -0400
Subject: [PATCH] feature/zuulv3 zm05.o.o to zm08.o.o

Add zuul-mergers for xenial and feature/zuulv3

Change-Id: Ifd8c14c8665687f8d77e3980dba56e781eb91c95
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 hiera/group/zuul-merger.yaml | 13 ++++++++++
 manifests/site.pp            | 46 ++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/hiera/group/zuul-merger.yaml b/hiera/group/zuul-merger.yaml
index 81a8bb1903..5af145cd50 100644
--- a/hiera/group/zuul-merger.yaml
+++ b/hiera/group/zuul-merger.yaml
@@ -1,4 +1,5 @@
 ---
+# TODO(pabelanger): This can be deleted once we migration to zuulv3.
 zuul_sites:
   - name: 'tarballs.openstack.org'
     host: 'tarballs.openstack.org'
@@ -49,3 +50,15 @@ zuul_nodes:
   - name: 'wheel-mirror-ubuntu-xenial-amd64.slave.openstack.org'
     host: 'wheel-mirror-ubuntu-xenial-amd64.slave.openstack.org'
     labels: 'wheel-mirror-ubuntu-xenial-amd64'
+
+# NOTE(pabelanger): zuulv3 settings
+zuul_connections:
+  - name: 'gerrit'
+    driver: 'gerrit'
+    server: 'review.openstack.org'
+    canonical_hostname: 'git.openstack.org'
+    user: 'zuul'
+    sshkey: '/var/lib/zuul/ssh/id_rsa'
+
+  - name: 'github'
+    driver: 'github'
diff --git a/manifests/site.pp b/manifests/site.pp
index 5b6e2c51f2..ed10b71657 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1427,6 +1427,52 @@ node /^zm0[1234].openstack\.org$/ {
   }
 }
 
+# Node-OS: xenial
+node /^zm0[5678].openstack\.org$/ {
+  $group = "zuul-merger"
+
+  $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'
+
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80],
+    sysadmins                 => hiera('sysadmins', []),
+  }
+
+  # NOTE(pabelanger): We call ::zuul directly, so we can override all in one
+  # settings.
+  class { '::zuul':
+    gearman_server          => 'zuulv3.openstack.org',
+    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,
+    python_version          => 3,
+    zookeeper_hosts         => 'nodepool.openstack.org:2181',
+    zuulv3                  => true,
+    connections             => hiera('zuul_connections', []),
+    gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'),
+    gearman_client_ssl_key  => hiera('gearman_client_ssl_key'),
+    gearman_ssl_ca          => hiera('gearman_ssl_ca'),
+  }
+
+  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,
+    manage_common_zuul   => false,
+  }
+}
+
 # Node-OS: trusty
 node 'zuul-dev.openstack.org' {
   $gearman_workers = []