summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-10-06 00:31:58 +0000
committerGerrit Code Review <review@openstack.org>2017-10-06 00:31:58 +0000
commit7b9f7fbd8861177ee2e5837dd776326ebbfedb4d (patch)
tree33682267964daa5a8d8b339c7c82885db8a182a3
parent48d4468b0179480f435a124a5e5ea84d22acfc87 (diff)
parentb6df511df0de5bb46b4e5cb09f751a9b81405016 (diff)
Merge "Enable #thanks feature statusbot"
-rw-r--r--manifests/init.pp1
-rw-r--r--templates/statusbot.config.erb4
2 files changed, 5 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 7003294..9ae03fb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,6 +16,7 @@ class statusbot(
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 $twitter = undef, 20 $twitter = undef,
20) { 21) {
21 22
diff --git a/templates/statusbot.config.erb b/templates/statusbot.config.erb
index fcc03cf..b2296ac 100644
--- a/templates/statusbot.config.erb
+++ b/templates/statusbot.config.erb
@@ -24,6 +24,10 @@ pageid=<%= @wiki_pageid %>
24<% if @wiki_successpageid %> 24<% if @wiki_successpageid %>
25successpageid=<%= @wiki_successpageid %> 25successpageid=<%= @wiki_successpageid %>
26<% end -%> 26<% end -%>
27<% if @wiki_thankspageid %>
28thankspageid=<%= @wiki_thankspageid %>
29<% end -%>
30
27 31
28<% if @irclogs_url %> 32<% if @irclogs_url %>
29[irclogs] 33[irclogs]