summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Perez <thingee@gmail.com>2018-01-04 07:56:11 -0800
committerMike Perez <thingee@gmail.com>2018-01-04 15:50:35 -0800
commit3973ed99a2b8487b45427363652966c5f0a171dd (patch)
treea86bf15d1b510862431ccfe20ac743a1081c728b
parent7b9f7fbd8861177ee2e5837dd776326ebbfedb4d (diff)
Add configuration for thanks/success page url
Avoiding these being hardcoded in openstack-infra/statusbot. Depends-On: I06d637c00dccbee49ad8a60398ac21af4064034e Change-Id: I0d36dbff893422e188b9e992f8e9bb3c1431419f
Notes
Notes (review): Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Code-Review+2: Jens Harbott (frickler) <j.harbott@x-ion.de> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 26 Jan 2018 04:31:44 +0000 Reviewed-on: https://review.openstack.org/531185 Project: openstack-infra/puppet-statusbot Branch: refs/heads/master
-rw-r--r--manifests/init.pp12
-rw-r--r--templates/statusbot.config.erb7
2 files changed, 14 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 9ae03fb..667fe83 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,11 +13,13 @@ class statusbot(
13 $twitter_secret = undef, 13 $twitter_secret = undef,
14 $twitter_token_key = undef, 14 $twitter_token_key = undef,
15 $twitter_token_secret = undef, 15 $twitter_token_secret = undef,
16 $channels = [], 16 $channels = [],
17 $irclogs_url = undef, 17 $irclogs_url = undef,
18 $wiki_successpageid = undef, 18 $wiki_successpageid = undef,
19 $wiki_thankspageid = undef, 19 $wiki_successpageurl = undef,
20 $twitter = undef, 20 $wiki_thankspageid = undef,
21 $wiki_thankspageurl = undef,
22 $twitter = undef,
21) { 23) {
22 24
23 user { 'statusbot': 25 user { 'statusbot':
diff --git a/templates/statusbot.config.erb b/templates/statusbot.config.erb
index b2296ac..4fff0a8 100644
--- a/templates/statusbot.config.erb
+++ b/templates/statusbot.config.erb
@@ -24,9 +24,16 @@ pageid=<%= @wiki_pageid %>
24<% if @wiki_successpageid %> 24<% if @wiki_successpageid %>
25successpageid=<%= @wiki_successpageid %> 25successpageid=<%= @wiki_successpageid %>
26<% end -%> 26<% end -%>
27<% if @wiki_successpageurl %>
28successpageurl=<%= @wiki_successpageurl %>
29<% end -%>
27<% if @wiki_thankspageid %> 30<% if @wiki_thankspageid %>
28thankspageid=<%= @wiki_thankspageid %> 31thankspageid=<%= @wiki_thankspageid %>
29<% end -%> 32<% end -%>
33<% if @wiki_thankspageurl %>
34thankspageurl=<%= @wiki_thankspageurl %>
35<% end -%>
36
30 37
31 38
32<% if @irclogs_url %> 39<% if @irclogs_url %>