Andrew Bogott has submitted this change and it was merged.
Change subject: Minor changes for labs testing
......................................................................
Minor changes for labs testing
Change-Id: I8bcdb15da1a0ecb30d9350d2e9b8616556576f54
---
M manifests/role/nova.pp
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 5c70dc4..6ab881a 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -160,7 +160,10 @@
class { 'openstack::common':
openstack_version => $openstack_version,
novaconfig => $novaconfig,
- instance_status_wiki_host => 'wikitech.wikimedia.org',
+ instance_status_wiki_host => $::realm ? {
+ 'production' => 'wikitech.wikimedia.org',
+ 'labs' => $::osm_hostname,
+ },
instance_status_wiki_domain => 'labs',
instance_status_wiki_page_prefix => 'Nova_Resource:',
instance_status_wiki_region => $::site,
@@ -209,6 +212,7 @@
include role::keystone::config::eqiad
include role::glance::config::eqiad
+ include role::nova::wikiupdates
if $::realm == 'labs' and $::openstack_site_override != undef {
$glanceconfig = $::openstack_site_override ? {
@@ -313,6 +317,7 @@
$novaconfig = $role::nova::config::novaconfig
include role::nova::common
+ include role::nova::wikiupdates
if ($::realm == production) {
$site_address = $::site ? {
--
To view, visit https://gerrit.wikimedia.org/r/169608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8bcdb15da1a0ecb30d9350d2e9b8616556576f54
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
