Andrew Bogott has submitted this change and it was merged.
Change subject: Fix security group fetching from nova api
......................................................................
Fix security group fetching from nova api
Change-Id: Ia21387c3a2544ca1d255dce8acddb2c448a016cc
---
M nova/OpenStackNovaInstance.php
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
DamianZaremba: Looks good to me, but someone else must approve
jenkins-bot: Checked
diff --git a/nova/OpenStackNovaInstance.php b/nova/OpenStackNovaInstance.php
index 3e26cad..2a6e6e8 100644
--- a/nova/OpenStackNovaInstance.php
+++ b/nova/OpenStackNovaInstance.php
@@ -206,12 +206,12 @@
* @return array
*/
function getSecurityGroups() {
- // Currently not implemented in the OpenStack API, so we're
- // implementing it as metadata for now
- $secgroup = OpenStackNovaController::_get_property(
$this->instance->metadata, 'secgroup' );
+ $secgroups = OpenStackNovaController::_get_property(
$this->instance, 'security_groups' );
$groups = array();
- if ( $secgroup ) {
- $groups = explode( ',', $secgroup );
+ if ( $secgroups ) {
+ foreach ( $secgroups as $secgroup ) {
+ $groups[] =
OpenStackNovaController::_get_property( $secgroup, 'name' );
+ }
}
return $groups;
}
--
To view, visit https://gerrit.wikimedia.org/r/64868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia21387c3a2544ca1d255dce8acddb2c448a016cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Ryan Lane <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: DamianZaremba <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
