Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325717
Change subject: Add $wgOpenStackHiddenUsernames global array
......................................................................
Add $wgOpenStackHiddenUsernames global array
This is because I'm going to add a utility users,
'novaobserver' to every project. I don't want
users to have the ability to remove this user, and
the easiest way to do that is just not display it in
the project gui.
Bug: T150092
Change-Id: Ic1cdbbf06fa8b026a9a0a9131f8114377415b96c
---
M OpenStackManager.php
M nova/OpenStackNovaController.php
2 files changed, 9 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/17/325717/1
diff --git a/OpenStackManager.php b/OpenStackManager.php
index bd53514..e0ac6e1 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -89,6 +89,10 @@
// %u is username, %p is $wgOpenStackManagerServiceGroupPrefix.
$wgOpenStackManagerServiceGroupHomedirPattern = '/home/%p%u/';
+// Username for special observer user -- hidden
+// from the OSM front end.
+$wgOpenStackHiddenUsernames = array('novaobserver');
+
// Key/value pairs like array( 'region1' => '10.4.0.11', 'region2' =>
'10.68.1.35' )
$wgOpenStackManagerProxyGateways = array();
diff --git a/nova/OpenStackNovaController.php b/nova/OpenStackNovaController.php
index 38a0c77..a02faba 100644
--- a/nova/OpenStackNovaController.php
+++ b/nova/OpenStackNovaController.php
@@ -345,6 +345,8 @@
* @return array of user IDs => user names
*/
function getUsersInProject( $projectid ) {
+ global $wgOpenStackHiddenUsernames;
+
$admintoken = $this->_getAdminToken();
$headers = array( "X-Auth-Token: $admintoken" );
@@ -357,7 +359,9 @@
foreach ( $users as $user ) {
$name = self::_get_property( $user, 'name' );
$id = self::_get_property( $user, 'id' );
- $userarr[$id] = $name;
+ if ( ! in_array( $id, $wgOpenStackHiddenUsernames ) ) {
+ $userarr[$id] = $name;
+ }
}
return $userarr;
}
--
To view, visit https://gerrit.wikimedia.org/r/325717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1cdbbf06fa8b026a9a0a9131f8114377415b96c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
