opendev/system-config
Code Issues Proposed changes

Update zuul module to take params for smtp

Browse Source 
Allow setting the smtp configuration options in the zuul puppet module

Change-Id: I1a603e64b87cf05cebaaca88334c19eeb09bec5f
This commit is contained in:
Joshua Hesketh 2014-05-23 15:28:46 +10:00
parent 9193bbb583
commit 47fd1e7d1b
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,10 @@ class zuul (
$statsd_host = '', $statsd_host = '',
$git_email = '', $git_email = '',
$git_name = '', $git_name = '',
$smtp_host = 'localhost',
$smtp_port = 25,
$smtp_default_from = "zuul@${::fqdn}",
$smtp_default_to = "zuul.reports@${::fqdn}",
$swift_authurl = '', $swift_authurl = '',
$swift_user = '', $swift_user = '',
$swift_key = '', $swift_key = '',

8
modules/zuul/templates/zuul.conf.erb
View File

@ -48,3 +48,11 @@ region_name=<%= swift_region_name %>
default_container=<%= swift_default_container %> default_container=<%= swift_default_container %>
default_logserver_prefix=<%= swift_default_logserver_prefix %> default_logserver_prefix=<%= swift_default_logserver_prefix %>
<% end -%> <% end -%>
<% if smtp_host != "" -%>
[smtp]
server=<%= smtp_host %>
port=<%= smtp_port %>
default_from=<%= smtp_default_from %>
default_to=<%= smtp_default_to %>
<% end -%>