Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/270743

Change subject: Move the wikitech apache config template into the openstack 
module
......................................................................

Move the wikitech apache config template into the openstack module

Change-Id: Id555f6d23ae3c1700efe2251bdcd3c3951c87056
---
M modules/openstack/manifests/openstack_manager.pp
R modules/openstack/templates/kilo/nova/wikitech.wikimedia.org.erb
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/270743/1

diff --git a/modules/openstack/manifests/openstack_manager.pp 
b/modules/openstack/manifests/openstack_manager.pp
index ac2747d..4f5256b 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("apache/sites/${webserver_hostname}.erb"),
+        content => 
template("openstack/${$openstack_version}/nova/${webserver_hostname}.erb"),
     }
 
     file {
diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb 
b/modules/openstack/templates/kilo/nova/wikitech.wikimedia.org.erb
similarity index 100%
rename from templates/apache/sites/wikitech.wikimedia.org.erb
rename to modules/openstack/templates/kilo/nova/wikitech.wikimedia.org.erb

-- 
To view, visit https://gerrit.wikimedia.org/r/270743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id555f6d23ae3c1700efe2251bdcd3c3951c87056
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to