Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108009
Change subject: Pass in a region to getHostByInstanceId
......................................................................
Pass in a region to getHostByInstanceId
Change-Id: I872842262f7835ea647a77c72c3598d083db217e
---
M nova/OpenStackNovaSudoer.php
1 file changed, 6 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/09/108009/1
diff --git a/nova/OpenStackNovaSudoer.php b/nova/OpenStackNovaSudoer.php
index f2e5353..59e848f 100644
--- a/nova/OpenStackNovaSudoer.php
+++ b/nova/OpenStackNovaSudoer.php
@@ -160,8 +160,10 @@
if ( ( strcasecmp( $host, 'all' ) != 0 ) ) {
// For good measure, put the display name in
there too.
// modern instances identify themselves that
way.
- list ( $name, $domain ) = explode( '.', $host );
- $hostobj =
OpenStackNovaHost::getHostByInstanceId( $name );
+ list ( $name, $domainname ) = explode( '.',
$host );
+ $domain = OpenStackNovaDomain::getDomainByName(
$domainname );
+ $region = $domain->getLocation();
+ $hostobj =
OpenStackNovaHost::getHostByInstanceId( $name, $region );
if ( $hostobj ) {
$displayfqdn =
$hostobj->getFullyQualifiedDisplayName();
$sudoer['sudohost'][] = $displayfqdn;
@@ -300,7 +302,8 @@
list ( $name, $domain ) = explode( '.', $host );
$domainobj =
OpenStackNovaDomain::getDomainByName( $domain );
if ( $domainobj ) {
- $hostobj =
OpenStackNovaHost::getHostByInstanceId( $name );
+ $region = $domainobj->getLocation();
+ $hostobj =
OpenStackNovaHost::getHostByInstanceId( $name, $region );
if ( $hostobj ) {
$displayfqdn =
$hostobj->getFullyQualifiedDisplayName();
$sudoer['sudohost'][] =
$displayfqdn;
--
To view, visit https://gerrit.wikimedia.org/r/108009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I872842262f7835ea647a77c72c3598d083db217e
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
