GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/257696
Change subject: Share the RESTBase config template between production and labs ...................................................................... Share the RESTBase config template between production and labs The labs restbase hosts are going to continue using puppet for config management until scap3 matures. Puppet has recently been re-enabled on deployment-restbase01, which broke restbase there as no valid config was supplied. Thanks to the recent refactor reducing the config to variables only we should have no trouble sharing the same config template between production & labs. This patch makes it so. Change-Id: I81b83c9fb908e69f623224359f7a1be693e63af8 --- M hieradata/labs/deployment-prep/common.yaml D modules/restbase/templates/config.labs.yaml.erb 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/96/257696/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 7c899f0..ca699df 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -65,7 +65,6 @@ restbase::seeds: - 10.68.17.227 - 10.68.17.189 -restbase::config_template: restbase/config.labs.yaml.erb restbase::parsoid_uri: http://deployment-parsoid05.deployment-prep.eqiad.wmflabs:8000 restbase::statsd_host: labmon1001.eqiad.wmnet restbase::logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs diff --git a/modules/restbase/templates/config.labs.yaml.erb b/modules/restbase/templates/config.labs.yaml.erb deleted file mode 100644 index 622f72b..0000000 --- a/modules/restbase/templates/config.labs.yaml.erb +++ /dev/null @@ -1,3 +0,0 @@ -# Current labs testing is using scap3, so this is entirely unused. If we start -# using this again, we should really share a config with production. -# -- gwicke Mon Dec 7 12:00:43 PST 2015 -- To view, visit https://gerrit.wikimedia.org/r/257696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81b83c9fb908e69f623224359f7a1be693e63af8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke <gwi...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
