Andrew Bogott has submitted this change and it was merged.
Change subject: Remove a weird redefinition of controller_hostname.
......................................................................
Remove a weird redefinition of controller_hostname.
Can't imagine what this was about.
Change-Id: I26fe1ca99b512cb90e331a076c72ea6cc759744a
---
M manifests/role/nova.pp
1 file changed, 1 insertion(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 024e1ff..60ce83c 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -181,10 +181,6 @@
"production" => "208.80.155.0/22,10.0.0.0/8",
"labs" => "10.4.0.0/21",
},
- controller_hostname => $realm ? {
- "production" => "wikitech.wikimedia.org",
- "labs" => $fqdn,
- },
auth_uri => $::realm ? {
'production' => 'http://virt1000.wikimedia.org:5000',
'labs' => 'http://localhost:5000',
@@ -193,6 +189,7 @@
"production" => "http://wikitech.wikimedia.org:8000";,
"labs" => "http://${hostname}.${domain}:8000";,
},
+ controller_hostname => $controller_hostname,
ldap_host => $controller_hostname,
puppet_host => $controller_hostname,
puppet_db_host => $controller_hostname,
--
To view, visit https://gerrit.wikimedia.org/r/111789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26fe1ca99b512cb90e331a076c72ea6cc759744a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
