Thcipriani has uploaded a new change for review.

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

Change subject: tilerator to scap3 deployment
......................................................................

tilerator to scap3 deployment

Change-Id: Ie5c239f78a991609e06d329d9b31d290bf496957
---
M hieradata/common/role/deployment.yaml
M hieradata/common/scap/server.yaml
M modules/tilerator/manifests/init.pp
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/293518/1

diff --git a/hieradata/common/role/deployment.yaml 
b/hieradata/common/role/deployment.yaml
index bf59741..5b92a1e 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -91,9 +91,6 @@
     checkout_submodules: true
   sentry/sentry:
     upstream: https://gerrit.wikimedia.org/r/operations/software/sentry
-  tilerator/deploy:
-    upstream: https://gerrit.wikimedia.org/r/maps/tilerator/deploy
-    checkout_submodules: true
   cassandra/logstash-logback-encoder:
     gitfat_enabled: true
     upstream: 
https://gerrit.wikimedia.org/r/operations/software/logstash-logback-encoder
diff --git a/hieradata/common/scap/server.yaml 
b/hieradata/common/scap/server.yaml
index 5530687..5387b08 100644
--- a/hieradata/common/scap/server.yaml
+++ b/hieradata/common/scap/server.yaml
@@ -56,6 +56,8 @@
 
   kartotherian/deploy: {}
 
+  tilerator/deploy: {}
+
   # cxserver is the ContentTranslation server.
   cxserver/deploy:
     repository: cxserver/deploy
diff --git a/modules/tilerator/manifests/init.pp 
b/modules/tilerator/manifests/init.pp
index a211c4a..4a7bff9 100644
--- a/modules/tilerator/manifests/init.pp
+++ b/modules/tilerator/manifests/init.pp
@@ -22,6 +22,7 @@
     # So there will never be LVS or anything else than health check requests to
     # this port
     service::node { 'tilerator':
+        deployment => 'scap3',
         port       => 6534,
         config     => template('tilerator/config.yaml.erb'),
         no_workers => $::processorcount / 2,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5c239f78a991609e06d329d9b31d290bf496957
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to