From c757a7f1c5050b9b8447d3b6b7093887dc5c7897 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 22 Dec 2017 17:46:55 +0000
Subject: [PATCH] Set gerrit2 as an alias to root on Gerrit servers

Now that the exim module supports custom arrays of aliases (but has
ceased explicitly providing one for gerrit2), set the gerrit2 alias
for root E-mail delivery on review.o.o and review-dev.o.o. Also
plumb this through openstack_project::server so it can be used for
similar purposes on other servers.

Change-Id: I05df49af6abdf1494bdf0fee1be4cc79ec5b06d9
Depends-On: I2911f157812c127a514196ae58b7609378d7d4e4
---
 manifests/site.pp                             | 2 ++
 modules/openstack_project/manifests/server.pp | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 764e68e5a0..7b3b98c8b4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -24,6 +24,7 @@ node 'review.openstack.org' {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80, 443, 29418],
     sysadmins                 => hiera('sysadmins', []),
+    extra_aliases             => { 'gerrit2' => 'root' },
   }
 
   class { 'openstack_project::review':
@@ -65,6 +66,7 @@ node 'review-dev.openstack.org' {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80, 443, 29418],
     sysadmins                 => hiera('sysadmins', []),
+    extra_aliases             => { 'gerrit2' => 'root' },
     afs                       => true,
   }
 
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index c0f26e8567..a143f14c3b 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -8,6 +8,7 @@ class openstack_project::server (
   $iptables_rules6           = [],
   $iptables_allowed_hosts    = [],
   $sysadmins                 = [],
+  $extra_aliases             = {},
   $pin_puppet                = '3.',
   $ca_server                 = undef,
   $enable_unbound            = true,
@@ -181,7 +182,8 @@ class openstack_project::server (
 
   if $manage_exim {
     class { 'exim':
-      sysadmins => $sysadmins,
+      sysadmins     => $sysadmins,
+      extra_aliases => $extra_aliases,
     }
   }