diff --git a/manifests/site.pp b/manifests/site.pp index 80384e6855..275530d64e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -145,6 +145,7 @@ node 'eavesdrop.openstack.org' { statusbot_password => hiera('statusbot_nick_password'), statusbot_server => 'chat.freenode.net', statusbot_channels => 'openstack-infra', + statusbot_auth_nicks => 'jeblair, ttx, fungi, mordred, clarkb, sdague', statusbot_wiki_user => hiera('statusbot_wiki_username'), statusbot_wiki_password => hiera('statusbot_wiki_password'), statusbot_wiki_url => 'https://wiki.openstack.org/w/api.php', diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp index 1954bcad91..a1712c56c8 100644 --- a/modules/openstack_project/manifests/eavesdrop.pp +++ b/modules/openstack_project/manifests/eavesdrop.pp @@ -5,6 +5,7 @@ class openstack_project::eavesdrop ( $statusbot_password = '', $statusbot_server = '', $statusbot_channels = '', + $statusbot_auth_nicks = '', $statusbot_wiki_user = '', $statusbot_wiki_password = '', $statusbot_wiki_url = '', @@ -30,6 +31,7 @@ class openstack_project::eavesdrop ( password => $statusbot_password, server => $statusbot_server, channels => $statusbot_channels, + auth_nicks => $statusbot_auth_nicks, wiki_user => $statusbot_wiki_user, wiki_password => $statusbot_wiki_password, wiki_url => $statusbot_wiki_url, diff --git a/modules/statusbot/manifests/init.pp b/modules/statusbot/manifests/init.pp index 00b9432f23..4e20b40a8a 100644 --- a/modules/statusbot/manifests/init.pp +++ b/modules/statusbot/manifests/init.pp @@ -5,6 +5,7 @@ class statusbot( $password = '', $server = '', $channels = '', + $auth_nicks = '', $wiki_user = '', $wiki_password = '', $wiki_url = '', diff --git a/modules/statusbot/templates/statusbot.config.erb b/modules/statusbot/templates/statusbot.config.erb index b4658ab888..55dec51435 100644 --- a/modules/statusbot/templates/statusbot.config.erb +++ b/modules/statusbot/templates/statusbot.config.erb @@ -4,6 +4,7 @@ pass=<%= password %> server=<%= server %> port=6667 channels=<%= channels %> +nicks=<%= auth_nicks %> lockfile=/var/run/statusbot/statusbot.pid log_config=/etc/statusbot/logging.config