Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270747
Change subject: Move the wikitech apache config, again
......................................................................
Move the wikitech apache config, again
Putting this under 'nova' was wrong since it's not nova-specific.
Also, I forgot to move the labtestwikitech config previously.
Change-Id: I88a6a5dfd9a4e0925bfe7a3de267e9366bf8f7d5
---
M modules/openstack/manifests/openstack_manager.pp
R modules/openstack/templates/kilo/labtestwikitech.wikimedia.org.erb
R modules/openstack/templates/kilo/wikitech.wikimedia.org.erb
3 files changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/270747/1
diff --git a/modules/openstack/manifests/openstack_manager.pp
b/modules/openstack/manifests/openstack_manager.pp
index 4f5256b..534a0f9 100644
--- a/modules/openstack/manifests/openstack_manager.pp
+++ b/modules/openstack/manifests/openstack_manager.pp
@@ -54,7 +54,7 @@
}
apache::site { $webserver_hostname:
- content =>
template("openstack/${$openstack_version}/nova/${webserver_hostname}.erb"),
+ content =>
template("openstack/${$openstack_version}/${webserver_hostname}.erb"),
}
file {
diff --git a/templates/apache/sites/labtestwikitech.wikimedia.org.erb
b/modules/openstack/templates/kilo/labtestwikitech.wikimedia.org.erb
similarity index 100%
rename from templates/apache/sites/labtestwikitech.wikimedia.org.erb
rename to modules/openstack/templates/kilo/labtestwikitech.wikimedia.org.erb
diff --git a/modules/openstack/templates/kilo/nova/wikitech.wikimedia.org.erb
b/modules/openstack/templates/kilo/wikitech.wikimedia.org.erb
similarity index 100%
rename from modules/openstack/templates/kilo/nova/wikitech.wikimedia.org.erb
rename to modules/openstack/templates/kilo/wikitech.wikimedia.org.erb
--
To view, visit https://gerrit.wikimedia.org/r/270747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88a6a5dfd9a4e0925bfe7a3de267e9366bf8f7d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
