opendev/system-config
Code Issues Proposed changes

Merge "Move statusbot_auth_nicks to hiera"

Browse Source
This commit is contained in:
Jenkins 2016-03-10 20:59:12 +00:00 committed by Gerrit Code Review
commit 6ec9b65a19
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hiera/common.yaml
View File

@ -423,3 +423,16 @@ infracloud_hpuswest_ssl_cert_file_contents: |
owvCaOxApNWme7u9u8YoxwjnqUg/z/+JnoK1BxK3egry7eqEfM53rhupELMAJbtP owvCaOxApNWme7u9u8YoxwjnqUg/z/+JnoK1BxK3egry7eqEfM53rhupELMAJbtP
WLk7r3L67Gsoy4WmFjQ= WLk7r3L67Gsoy4WmFjQ=
-----END CERTIFICATE----- -----END CERTIFICATE-----
statusbot_auth_nicks:
- jeblair
- ttx
- fungi
- mordred
- clarkb
- sdague
- SergeyLukjanov
- jhesketh
- lifeless
- pleia2
- yolanda
- nibalizer

2
manifests/site.pp
View File

@ -341,7 +341,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 => hiera_array('statusbot_channels', ['openstack_infra']), 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_user => hiera('statusbot_wiki_username', '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',