jenkins-bot has submitted this change and it was merged.
Change subject: Don't record members on bastion project page
......................................................................
Don't record members on bastion project page
It's too slow and causes failures when giving new users shell access
(by adding them to other projects).
Given that wgOpenStackManagerBastionProjectName signifies a project
that all users are to be added to, I think it's reasonable that we don't
bother providing a list of members.
If necessary, it's still possible to access this information via LDAP in labs,
with ldaplist -l group project-bastion
(This has been tested in production)
Bug: T114229
Change-Id: I945d9e752ccc7ebb0c93ef11258c7b7479a2aa80
(cherry picked from commit fb89faa2e435f81feafe37a2fdc545ffbd0799e3)
---
M nova/OpenStackNovaProject.php
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index 6585bef..e4936a3 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -907,7 +907,8 @@
}
function editArticle() {
- global $wgOpenStackManagerCreateProjectSALPages,
$wgOpenStackManagerProjectNamespace;
+ global $wgOpenStackManagerCreateProjectSALPages,
$wgOpenStackManagerProjectNamespace,
+ $wgOpenStackManagerBastionProjectName;
if ( ! OpenStackNovaArticle::canCreatePages() ) {
return;
@@ -923,8 +924,12 @@
RESOURCEINFO;
$rawmembers = $this->getMembers();
$members = array();
- foreach ( $rawmembers as $member ) {
- $members[] = 'User:' . $member;
+ // FIXME! This was too slow on the bastion project, which users
get added to automatically.
+ // See https://phabricator.wikimedia.org/T114229 for details.
+ if ( $this->getProjectName() !==
$wgOpenStackManagerBastionProjectName ) {
+ foreach ( $rawmembers as $member ) {
+ $members[] = 'User:' . $member;
+ }
}
$admins = array();
# All roles have elevated privileges, count them all as admins
--
To view, visit https://gerrit.wikimedia.org/r/244707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I945d9e752ccc7ebb0c93ef11258c7b7479a2aa80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: wmf/1.27.0-wmf.2
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
