summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2019-03-06 13:39:02 -0800
committerClark Boylan <clark.boylan@gmail.com>2019-03-07 08:28:25 -0800
commitf668e192ac3d2eb6f7fadba92e7c2b5939bb2703 (patch)
tree845a888f05b40aa1c9e3bc2b8b1f528571edac41
parent98c85cb0a710293c96ada8a264e987aaee5af9d6 (diff)
Define reply_to_email_addressHEADmaster
Puppet 4 was complaining that this variable was undefined. Define it to make this warning go away. We switch away from scope.lookupvar for consistency with the rest of the var lookups in this file and to keep our conditional short. Change-Id: I64cc9660a72bf5ab096c9c6f29080a838df5ddea
Notes
Notes (review): Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Code-Review+2: Colleen Murphy <colleen@gazlene.net> Workflow+1: Colleen Murphy <colleen@gazlene.net> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 07 Mar 2019 18:02:13 +0000 Reviewed-on: https://review.openstack.org/641486 Project: openstack-infra/puppet-storyboard Branch: refs/heads/master
-rw-r--r--manifests/application.pp1
-rw-r--r--templates/storyboard.conf.erb2
2 files changed, 2 insertions, 1 deletions
diff --git a/manifests/application.pp b/manifests/application.pp
index ae81d1e..e7591e7 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -61,6 +61,7 @@ class storyboard::application (
61 $default_url = 'https://storyboard.example.org', 61 $default_url = 'https://storyboard.example.org',
62 $smtp_host = 'localhost', 62 $smtp_host = 'localhost',
63 $smtp_port = 25, 63 $smtp_port = 25,
64 $reply_to_email_address = undef,
64 65
65) { 66) {
66 67
diff --git a/templates/storyboard.conf.erb b/templates/storyboard.conf.erb
index 6f6ba98..00edd55 100644
--- a/templates/storyboard.conf.erb
+++ b/templates/storyboard.conf.erb
@@ -153,7 +153,7 @@ enable = <%= @enable_email %>
153# The email address from which storyboard will send its messages. 153# The email address from which storyboard will send its messages.
154sender = <%= @sender_email_address %> 154sender = <%= @sender_email_address %>
155 155
156<% if scope.lookupvar('storyboard::application::reply_to_email_address') != :undef %> 156<% if @reply_to_email_address != :undef and @reply_to_email_address != nil %>
157 157
158# The email address of the Reply-To header (optional). 158# The email address of the Reply-To header (optional).
159reply_to = <%= @reply_to_email_address %> 159reply_to = <%= @reply_to_email_address %>