From fd200382b4e20319e3a831b2cefeb7539ed2a92b Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Thu, 17 Sep 2015 16:43:37 +0200 Subject: [PATCH] Enable the #success feature in statusbot This adds the configuration bits to enable the #success command in statusbot. Depends-On: I66b577732d1fec271a42f9229a8b5af2e52a58f4 Change-Id: Id26fb1a9dc27874040d2f5dd05bf20140d07512b --- doc/source/irc.rst | 12 ++++++++++-- manifests/site.pp | 4 ++++ modules/openstack_project/manifests/eavesdrop.pp | 4 ++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/doc/source/irc.rst b/doc/source/irc.rst index 41b583784e..ef7f4939b8 100644 --- a/doc/source/irc.rst +++ b/doc/source/irc.rst @@ -174,8 +174,9 @@ Statusbot Statusbot is used to distribute urgent information from the Infrastructure team to OpenStack channels. It updates the `Infrastructure Status wiki page -`_. It -supports the following public message commands when issued by +`_. + +It supports the following public message commands when issued by authenticated and whitelisted users from the channels the bot is listening to, including #openstack-infra: @@ -196,6 +197,13 @@ listening to, including #openstack-infra: Remove alert box and restore channel topics, optionally announcing and logging an "okay" message. +It supports the following commands when issued by any IRC user from +the channels the bot is listening to: + +#success [MESSAGE] + Log a message of success to the "Successes" wiki page. This is meant + as a collection mechanism for little celebration of small successes + in OpenStack development. .. _gerritbot: diff --git a/manifests/site.pp b/manifests/site.pp index 3bb54559ee..b64cf37fd2 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -321,7 +321,11 @@ node 'eavesdrop.openstack.org' { statusbot_wiki_user => hiera('statusbot_wiki_username', 'username'), statusbot_wiki_password => hiera('statusbot_wiki_password', 'XXX'), statusbot_wiki_url => 'https://wiki.openstack.org/w/api.php', + # https://wiki.openstack.org/wiki/Infrastructure_Status statusbot_wiki_pageid => '1781', + # https://wiki.openstack.org/wiki/Successes + statusbot_wiki_successpageid => '7717', + statusbot_irclogs_url => 'http://eavesdrop.openstack.org/irclogs/%(chan)s/%(chan)s.%(date)s.log.html', accessbot_nick => hiera('accessbot_nick', 'username'), accessbot_password => hiera('accessbot_nick_password', 'XXX'), } diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp index da4ced3836..b409f2656e 100644 --- a/modules/openstack_project/manifests/eavesdrop.pp +++ b/modules/openstack_project/manifests/eavesdrop.pp @@ -11,6 +11,8 @@ class openstack_project::eavesdrop ( $statusbot_wiki_password = '', $statusbot_wiki_url = '', $statusbot_wiki_pageid = '', + $statusbot_wiki_successpageid = '', + $statusbot_irclogs_url = '', $accessbot_nick = '', $accessbot_password = '', $project_config_repo = '', @@ -116,6 +118,8 @@ class openstack_project::eavesdrop ( wiki_password => $statusbot_wiki_password, wiki_url => $statusbot_wiki_url, wiki_pageid => $statusbot_wiki_pageid, + wiki_successpageid => $statusbot_wiki_successpageid, + irclogs_url => $statusbot_irclogs_url, } file { '/srv/meetbot-openstack/alert':