Jcrespo has submitted this change and it was merged.
Change subject: shinken: Fix inclusion of labs proxyagent password in shinkengen
......................................................................
shinken: Fix inclusion of labs proxyagent password in shinkengen
Apparently at some point this stopped being required in base?
It's a bit strange because shinken-01.shinken.eqiad.wmflabs still seems
perfectly happy, but on shinken-ircbot-testing.shinken.eqiad.wmflabs this is
causing shinkengen to get a blank LDAP password and therefore output blank
files, meaning shinken won't start.
Change-Id: Icedfff2eb5fdd0fac36977e8eecc60e1d34f1835
---
M modules/shinken/manifests/shinkengen.pp
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/shinken/manifests/shinkengen.pp
b/modules/shinken/manifests/shinkengen.pp
index c2b74f0..642047f 100644
--- a/modules/shinken/manifests/shinkengen.pp
+++ b/modules/shinken/manifests/shinkengen.pp
@@ -13,16 +13,14 @@
#
# [*ldap_bindas*]
# What to bind as when connecting to LDAP server
-#
-# [*ldap_pass*]
-# Simple LDAP password to use when connecting to LDAP server
class shinken::shinkengen(
$ldap_server = 'ldap-eqiad.wikimedia.org',
$ldap_bindas = 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org',
- $ldap_pass = $passwords::ldap::labs::proxypass,
){
include shinken
+ include passwords::ldap::labs
+ $ldap_pass = $passwords::ldap::labs::proxypass
package { [
'python3-ldap3', # Custom package of
https://pypi.python.org/pypi/python3-ldap
--
To view, visit https://gerrit.wikimedia.org/r/241526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icedfff2eb5fdd0fac36977e8eecc60e1d34f1835
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
