Yuvipanda has submitted this change and it was merged.
Change subject: labstore: Don't fetch 'homedir' property from LDAP
......................................................................
labstore: Don't fetch 'homedir' property from LDAP
Is fairly useless since the homeDirectory is tuned to the
path on the NFS client and not on the NFS server
Change-Id: I3f7bd5afa14cea5d0f3543a1b0622e969fdcb923
---
M modules/labstore/files/create-dbusers
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/labstore/files/create-dbusers
b/modules/labstore/files/create-dbusers
index 65d7af4..ae3e090 100755
--- a/modules/labstore/files/create-dbusers
+++ b/modules/labstore/files/create-dbusers
@@ -26,11 +26,10 @@
class User:
- def __init__(self, project, name, uid, homedir):
+ def __init__(self, project, name, uid):
self.project = project
self.name = name
self.uid = int(uid)
- self.homedir = homedir
@property
def db_username(self):
@@ -42,8 +41,8 @@
return 's%s' % self.uid
def __repr__(self):
- return "User(name=%s, uid=%s, homedir=%s)" % (
- self.name, self.uid, self.homedir)
+ return "User(name=%s, uid=%s)" % (
+ self.name, self.uid)
@classmethod
def from_ldap_servicegroups(cls, conn, projectname):
@@ -51,12 +50,12 @@
'ou=people,ou=servicegroups,dc=wikimedia,dc=org',
'(cn=%s.*)' % projectname,
ldap3.SEARCH_SCOPE_WHOLE_SUBTREE,
- attributes=['uidNumber', 'homeDirectory', 'cn']
+ attributes=['uidNumber', 'cn']
)
users = []
for resp in conn.response:
attrs = resp['attributes']
- users.append(cls(projectname, attrs['cn'][0],
attrs['uidNumber'][0], attrs['homeDirectory'][0]))
+ users.append(cls(projectname, attrs['cn'][0],
attrs['uidNumber'][0]))
return users
--
To view, visit https://gerrit.wikimedia.org/r/227422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f7bd5afa14cea5d0f3543a1b0622e969fdcb923
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
