Yuvipanda has submitted this change and it was merged.

Change subject: labs: Set timeout for ldap3 using scripts
......................................................................


labs: Set timeout for ldap3 using scripts

Bug: T142394
Change-Id: I2f437ea3ef6f0310b0db5f60fac7358a41107e65
---
M modules/labstore/files/create-dbusers
M modules/toollabs/files/maintain-kubeusers
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/modules/labstore/files/create-dbusers 
b/modules/labstore/files/create-dbusers
index b9175b7..bfa73d1 100755
--- a/modules/labstore/files/create-dbusers
+++ b/modules/labstore/files/create-dbusers
@@ -64,7 +64,8 @@
             'ou=people,ou=servicegroups,dc=wikimedia,dc=org',
             '(cn=%s.*)' % projectname,
             ldap3.SEARCH_SCOPE_WHOLE_SUBTREE,
-            attributes=['uidNumber', 'cn']
+            attributes=['uidNumber', 'cn'],
+            time_limit=5
         )
         users = []
         for resp in conn.response:
diff --git a/modules/toollabs/files/maintain-kubeusers 
b/modules/toollabs/files/maintain-kubeusers
index 4cdd83f..3b4118c 100755
--- a/modules/toollabs/files/maintain-kubeusers
+++ b/modules/toollabs/files/maintain-kubeusers
@@ -92,7 +92,8 @@
         'ou=people,ou=servicegroups,dc=wikimedia,dc=org',
         '(cn=%s.*)' % projectname,
         ldap3.SEARCH_SCOPE_WHOLE_SUBTREE,
-        attributes=['uidNumber', 'cn']
+        attributes=['uidNumber', 'cn'],
+        time_limit=5
     )
     tools = {}
     for resp in conn.response:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f437ea3ef6f0310b0db5f60fac7358a41107e65
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Coren <m...@uberbox.org>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
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

Reply via email to