Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/303565

Change subject: labstore: Configure LDAP failover + timeout for create-dbuser
......................................................................

labstore: Configure LDAP failover + timeout for create-dbuser

Bug: T142394
Change-Id: Id90cba740000ab9f03686cf9b2e8bdd9c12f92bf
---
M modules/labstore/files/create-dbusers
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/303565/1

diff --git a/modules/labstore/files/create-dbusers 
b/modules/labstore/files/create-dbusers
index 0e95812..eeb6271 100755
--- a/modules/labstore/files/create-dbusers
+++ b/modules/labstore/files/create-dbusers
@@ -224,9 +224,12 @@
     logging.debug(str(args))
 
     while True:
-        server = ldap3.Server(config['ldap']['host'])
+        servers = [
+            ldap3.Server(host, connect_timeout=10)
+            for host in config['ldap']['hosts']
+        ]
         with ldap3.Connection(
-            server, read_only=True,
+            servers, read_only=True,
             user=config['ldap']['username'],
             auto_bind=True,
             password=config['ldap']['password']

-- 
To view, visit https://gerrit.wikimedia.org/r/303565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id90cba740000ab9f03686cf9b2e8bdd9c12f92bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to