From 47fd1e7d1b50623f3dc218a4d7481a3743cdc794 Mon Sep 17 00:00:00 2001
From: Joshua Hesketh <josh@nitrotech.org>
Date: Fri, 23 May 2014 15:28:46 +1000
Subject: [PATCH] Update zuul module to take params for smtp

Allow setting the smtp configuration options in the zuul puppet module

Change-Id: I1a603e64b87cf05cebaaca88334c19eeb09bec5f
---
 modules/zuul/manifests/init.pp       | 4 ++++
 modules/zuul/templates/zuul.conf.erb | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 18b21528ef..26525f826a 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -34,6 +34,10 @@ class zuul (
   $statsd_host = '',
   $git_email = '',
   $git_name = '',
+  $smtp_host = 'localhost',
+  $smtp_port = 25,
+  $smtp_default_from = "zuul@${::fqdn}",
+  $smtp_default_to = "zuul.reports@${::fqdn}",
   $swift_authurl = '',
   $swift_user = '',
   $swift_key = '',
diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb
index 15c8f4074c..b138a02f10 100644
--- a/modules/zuul/templates/zuul.conf.erb
+++ b/modules/zuul/templates/zuul.conf.erb
@@ -48,3 +48,11 @@ region_name=<%= swift_region_name %>
 default_container=<%= swift_default_container %>
 default_logserver_prefix=<%= swift_default_logserver_prefix %>
 <% end -%>
+
+<% if smtp_host != "" -%>
+[smtp]
+server=<%= smtp_host %>
+port=<%= smtp_port %>
+default_from=<%= smtp_default_from %>
+default_to=<%= smtp_default_to %>
+<% end -%>