Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377916 )
Change subject: Deploy discovery-analytics with scap3
......................................................................
Deploy discovery-analytics with scap3
Bug: T129149
Depends-On: Icd80f28ee1a950cea72ec7b00e639526fe9bb846
Change-Id: I2284aa559a6f5bddbd2c7277539eb7869acdd3f3
---
M hieradata/common/role/deployment.yaml
M hieradata/common/scap/dsh.yaml
M hieradata/role/common/deployment_server.yaml
M modules/role/manifests/elasticsearch/analytics.pp
4 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/377916/1
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index 7ebceb6..dfd570f 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -18,8 +18,6 @@
upstream:
https://gerrit.wikimedia.org/r/operations/software/dropwizard-metrics
sentry/sentry:
upstream: https://gerrit.wikimedia.org/r/operations/software/sentry
- wikimedia/discovery/analytics:
- upstream: https://gerrit.wikimedia.org/r/wikimedia/discovery/analytics
analytics/aqs/deploy:
upstream: https://gerrit.wikimedia.org/r/analytics/aqs/deploy
service_name: aqs
diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index e220bec..c12c347 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -78,6 +78,9 @@
- restbase-test2002.codfw.wmnet
- restbase-test2003.codfw.wmnet
- xenon.eqiad.wmnet
+ discovery-analytics:
+ hosts:
+ - stat1005.eqiad.wmnet
librenms:
hosts:
- netmon1002.wikimedia.org
diff --git a/hieradata/role/common/deployment_server.yaml
b/hieradata/role/common/deployment_server.yaml
index ee5dfa7..b8bbe93 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -145,6 +145,8 @@
# Wikimania scholarships app
scholarships/scholarships:
repository: wikimedia/wikimania-scholarships
+ wikimedia/discovery/analytics:
+ repository: discovery/analytics
wdqs/wdqs:
repository: wikidata/query/deploy
# lvs_service: wdqs
diff --git a/modules/role/manifests/elasticsearch/analytics.pp
b/modules/role/manifests/elasticsearch/analytics.pp
index 7f0631a..a46391e 100644
--- a/modules/role/manifests/elasticsearch/analytics.pp
+++ b/modules/role/manifests/elasticsearch/analytics.pp
@@ -1,7 +1,7 @@
# Supports CirrusSearch usage on the analytics cluster
class role::elasticsearch::analytics {
# wikimedia/discovery/analytics will be deployed to this node
- package { 'wikimedia/discovery/analytics':
- provider => 'trebuchet',
+ scap::target { 'wikimedia/discovery/analytics':
+ deploy_user => 'deploy-service',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/377916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2284aa559a6f5bddbd2c7277539eb7869acdd3f3
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
