From 87585f78e70fd00939672a6d691e72420e3769ea Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Fri, 29 Jan 2016 13:34:24 -0800 Subject: [PATCH] Move statusbot_auth_nicks to hiera Follow the same pattern as channels Depends-On: Ief0848ac8e2f2132455c07c0e5d113c7b3def5ca Change-Id: I1f10e74e9b9571b6b90dea75c8319243f368f975 --- hiera/common.yaml | 13 +++++++++++++ manifests/site.pp | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hiera/common.yaml b/hiera/common.yaml index 9d4f94148c..e12f5ec0a4 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -345,3 +345,16 @@ infracloud_hpuswest_ssl_cert_file_contents: | owvCaOxApNWme7u9u8YoxwjnqUg/z/+JnoK1BxK3egry7eqEfM53rhupELMAJbtP WLk7r3L67Gsoy4WmFjQ= -----END CERTIFICATE----- +statusbot_auth_nicks: +- jeblair +- ttx +- fungi +- mordred +- clarkb +- sdague +- SergeyLukjanov +- jhesketh +- lifeless +- pleia2 +- yolanda +- nibalizer diff --git a/manifests/site.pp b/manifests/site.pp index be004a1e14..9c745b0ee9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -337,7 +337,7 @@ node 'eavesdrop.openstack.org' { statusbot_password => hiera('statusbot_nick_password'), statusbot_server => 'chat.freenode.net', statusbot_channels => hiera_array('statusbot_channels', ['openstack_infra']), - statusbot_auth_nicks => 'jeblair, ttx, fungi, mordred, clarkb, sdague, SergeyLukjanov, jhesketh, lifeless, pleia2, yolanda, nibalizer', + statusbot_auth_nicks => hiera_array('statusbot_auth_nicks'), statusbot_wiki_user => hiera('statusbot_wiki_username', 'username'), statusbot_wiki_password => hiera('statusbot_wiki_password'), statusbot_wiki_url => 'https://wiki.openstack.org/w/api.php',