opendev/system-config
Code Issues Proposed changes

Move email addresses of sysadmins to paramater.

Browse Source 
When we put these all in by default, then people testing things or people
who aren't even us get the mail on their systems configured to email us.
Change-Id: Ib9d4160e0c81151bf040422c89621bc0fcefcd66
This commit is contained in:
Monty Taylor 2012-04-08 09:22:16 -07:00
parent fe5e6f21f4
commit c51538102d
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/site.pp
View File

@ -7,7 +7,7 @@ class openstack_base ($iptables_public_tcp_ports) {
include openstack_project::users include openstack_project::users
include ssh include ssh
include snmpd include snmpd
include exim
include sudoers include sudoers
class { 'iptables': class { 'iptables':
@ -72,6 +72,12 @@ class openstack_server ($iptables_public_tcp_ports) {
class { 'openstack_template': class { 'openstack_template':
iptables_public_tcp_ports => $iptables_public_tcp_ports iptables_public_tcp_ports => $iptables_public_tcp_ports
} }
class { 'exim':
sysadmin => ['corvus@inaugust.com',
'mordred@inaugust.com',
'andrew@linuxjedi.co.uk',
'devananda.vdv@gmail.com']
}
include openstack_cron include openstack_cron
} }

9
manifests/stackforge.pp
View File

@ -7,7 +7,6 @@ class openstack_base ($iptables_public_tcp_ports) {
include openstack_project::users include openstack_project::users
include ssh include ssh
include snmpd include snmpd
include exim
include sudoers include sudoers
class { 'iptables': class { 'iptables':
@ -63,6 +62,12 @@ class openstack_server ($iptables_public_tcp_ports) {
class { 'openstack_template': class { 'openstack_template':
iptables_public_tcp_ports => $iptables_public_tcp_ports iptables_public_tcp_ports => $iptables_public_tcp_ports
} }
class { 'exim':
sysadmin => ['corvus@inaugust.com',
'mordred@inaugust.com',
'andrew@linuxjedi.co.uk',
'devananda.vdv@gmail.com']
}
} }
class openstack_jenkins_slave { class openstack_jenkins_slave {
@ -79,7 +84,7 @@ class openstack_jenkins_slave {
# #
node default { node default {
class { 'openstack_server': class { 'openstack_template':
iptables_public_tcp_ports => [] iptables_public_tcp_ports => []
} }
} }

4
modules/exim/manifests/init.pp
View File

@ -1,4 +1,4 @@
class exim() { class exim($sysadmin=[]) {
package { 'exim4-base': package { 'exim4-base':
ensure => present; ensure => present;
} }
@ -30,7 +30,7 @@ class exim() {
group => 'root', group => 'root',
mode => 444, mode => 444,
ensure => 'present', ensure => 'present',
source => 'puppet:///modules/exim/aliases', content => template("exim/aliases.erb"),
replace => 'true', replace => 'true',
} }
} }

9
modules/exim/files/aliases → modules/exim/templates/aliases.erb
View File

@ -12,7 +12,8 @@ abuse: root
noc: root noc: root
security: root security: root
sysadmin: corvus@inaugust.com, mordred@inaugust.com, andrew@linuxjedi.co.uk, devananda.vdv@gmail.com gerrit2: root
root: sysadmin jenkins: root
gerrit2: sysadmin <% if sysadmin.length > 0 -%>
jenkins: sysadmin root: <%= sysadmin.join(",") %>
<% end -%>