opendev/system-config
Code Issues Proposed changes

Add nicks parameter to statusbot.

Browse Source 
Change-Id: I293f4b5dd76de562cec39b4c995a2c255d383263
Reviewed-on: https://review.openstack.org/25765
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-03-29 15:43:31 -07:00 committed by Jenkins
parent ed3fb4e5a2
commit f8a514bfe7
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -145,6 +145,7 @@ node 'eavesdrop.openstack.org' {
statusbot_password => hiera('statusbot_nick_password'), statusbot_password => hiera('statusbot_nick_password'),
statusbot_server => 'chat.freenode.net', statusbot_server => 'chat.freenode.net',
statusbot_channels => 'openstack-infra', statusbot_channels => 'openstack-infra',
statusbot_auth_nicks => 'jeblair, ttx, fungi, mordred, clarkb, sdague',
statusbot_wiki_user => hiera('statusbot_wiki_username'), statusbot_wiki_user => hiera('statusbot_wiki_username'),
statusbot_wiki_password => hiera('statusbot_wiki_password'), statusbot_wiki_password => hiera('statusbot_wiki_password'),
statusbot_wiki_url => 'https://wiki.openstack.org/w/api.php', statusbot_wiki_url => 'https://wiki.openstack.org/w/api.php',

2
modules/openstack_project/manifests/eavesdrop.pp
View File

@ -5,6 +5,7 @@ class openstack_project::eavesdrop (
$statusbot_password = '', $statusbot_password = '',
$statusbot_server = '', $statusbot_server = '',
$statusbot_channels = '', $statusbot_channels = '',
$statusbot_auth_nicks = '',
$statusbot_wiki_user = '', $statusbot_wiki_user = '',
$statusbot_wiki_password = '', $statusbot_wiki_password = '',
$statusbot_wiki_url = '', $statusbot_wiki_url = '',
@ -30,6 +31,7 @@ class openstack_project::eavesdrop (
password => $statusbot_password, password => $statusbot_password,
server => $statusbot_server, server => $statusbot_server,
channels => $statusbot_channels, channels => $statusbot_channels,
auth_nicks => $statusbot_auth_nicks,
wiki_user => $statusbot_wiki_user, wiki_user => $statusbot_wiki_user,
wiki_password => $statusbot_wiki_password, wiki_password => $statusbot_wiki_password,
wiki_url => $statusbot_wiki_url, wiki_url => $statusbot_wiki_url,

1
modules/statusbot/manifests/init.pp
View File

@ -5,6 +5,7 @@ class statusbot(
$password = '', $password = '',
$server = '', $server = '',
$channels = '', $channels = '',
$auth_nicks = '',
$wiki_user = '', $wiki_user = '',
$wiki_password = '', $wiki_password = '',
$wiki_url = '', $wiki_url = '',

1
modules/statusbot/templates/statusbot.config.erb
View File

@ -4,6 +4,7 @@ pass=<%= password %>
server=<%= server %> server=<%= server %>
port=6667 port=6667
channels=<%= channels %> channels=<%= channels %>
nicks=<%= auth_nicks %>
lockfile=/var/run/statusbot/statusbot.pid lockfile=/var/run/statusbot/statusbot.pid
log_config=/etc/statusbot/logging.config log_config=/etc/statusbot/logging.config