Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/146512
Change subject: DRAFT: attribute OpenStackNovaHostJob edits to the proper user.
......................................................................
DRAFT: attribute OpenStackNovaHostJob edits to the proper user.
Change-Id: I4bc953b055ce2b29729b17d70eb1fdc97557bc04
---
M nova/OpenStackNovaHostJob.php
M special/SpecialNovaInstance.php
2 files changed, 12 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/12/146512/1
diff --git a/nova/OpenStackNovaHostJob.php b/nova/OpenStackNovaHostJob.php
index e29e4bc..fdd5574 100644
--- a/nova/OpenStackNovaHostJob.php
+++ b/nova/OpenStackNovaHostJob.php
@@ -29,10 +29,19 @@
* @return bool
*/
public function run() {
+ global $wgUser;
global $wgAuth;
global $wgOpenStackManagerLDAPUsername;
global $wgOpenStackManagerLDAPUserPassword;
+ $user = isset( $params['user'] )
+ ? User::newFromName( $options['user'] )
+ : User::newFromName( 'OpenStackManager Extension' );
+ if ( !$user instanceof User ) {
+ $user = User::newFromName( 'OpenStackManager Extension'
);
+ }
+ $wgUser = $user;
+
$instanceid = $this->params['instanceid'];
$instanceosid = $this->params['instanceosid'];
$project = $this->params['project'];
diff --git a/special/SpecialNovaInstance.php b/special/SpecialNovaInstance.php
index 859d8c3..7960baf 100644
--- a/special/SpecialNovaInstance.php
+++ b/special/SpecialNovaInstance.php
@@ -644,6 +644,8 @@
* @return bool
*/
function tryCreateSubmit( $formData, $entryPoint = 'internal' ) {
+ global $wgUser;
+
$domain = OpenStackNovaDomain::getDomainByName(
$formData['region'] );
$project = $formData['project'];
$region = $formData['region'];
@@ -665,7 +667,7 @@
$instance->setHost( $host );
OpenStackManagerEvent::storeEventInfo( 'build',
$this->getUser(), $instance, $project );
$title = Title::newFromText(
$this->getOutput()->getPageTitle() );
- $job = new OpenStackNovaHostJob( $title, array(
'instanceid' => $instance->getInstanceId(), 'instanceosid' =>
$instance->getInstanceOSId(), 'project' => $project, 'region' => $region ) );
+ $job = new OpenStackNovaHostJob( $title, array(
'instanceid' => $instance->getInstanceId(), 'instanceosid' =>
$instance->getInstanceOSId(), 'project' => $project, 'region' => $region,
'user' => $wgUser->getName() ) );
$job->insert();
$image = $this->userNova->getImage(
$instance->getImageId() );
$imageName = $image->getImageName();
--
To view, visit https://gerrit.wikimedia.org/r/146512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bc953b055ce2b29729b17d70eb1fdc97557bc04
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
