Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201370
Change subject: Include associated domains like .<project>.eqiad.wmflabs for
new instances
......................................................................
Include associated domains like .<project>.eqiad.wmflabs for new instances
Change-Id: I6e93995c14db89edac879f35b89fd815e8ac2e1e
(cherry picked from commit 36cb947bcbb0f9dfab63ca6ba9ba3c0db62cb3d4)
---
M nova/OpenStackNovaHost.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/70/201370/1
diff --git a/nova/OpenStackNovaHost.php b/nova/OpenStackNovaHost.php
index a6a9646..8df1d55 100644
--- a/nova/OpenStackNovaHost.php
+++ b/nova/OpenStackNovaHost.php
@@ -333,6 +333,9 @@
}
$hostEntry['associateddomain'][] = $instanceid . '.' .
$domainname;
$hostEntry['associateddomain'][] = $hostname . '.' .
$domainname;
+ $projectName = $project->getProjectName();
+ $hostEntry['associateddomain'][] = $instanceid . '.' .
$projectName . '.' . $domainname;
+ $hostEntry['associateddomain'][] = $hostname . '.' .
$projectName . '.' . $domainname;
$hostEntry['l'] = $domain->getLocation();
if ( $wgOpenStackManagerPuppetOptions['enabled'] ) {
$hostEntry['objectclass'][] = 'puppetclient';
--
To view, visit https://gerrit.wikimedia.org/r/201370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e93995c14db89edac879f35b89fd815e8ac2e1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: wmf/1.25wmf24
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
