opendev
/
system-config
Code Issues Proposed changes

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
This commit is contained in:
Jeremy Stanley 2017-12-22 17:46:55 +00:00
parent 0d9ef4cc88
commit c757a7f1c5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

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

4
modules/openstack_project/manifests/server.pp
View File

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