Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354472 )
Change subject: Scap3: deploy logstash/plugins with scap3
......................................................................
Scap3: deploy logstash/plugins with scap3
Bug: T165748
Change-Id: I7a90067d4e25ece7590aaf6d6f603ca5f2a7072b
---
M hieradata/common/role/deployment.yaml
M hieradata/common/scap/dsh.yaml
M hieradata/role/common/deployment_server.yaml
M modules/logstash/manifests/init.pp
4 files changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/354472/1
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index 7612021..ec75665 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -40,9 +40,6 @@
cassandra/logstash-logback-encoder:
gitfat_enabled: true
upstream:
https://gerrit.wikimedia.org/r/operations/software/logstash-logback-encoder
- logstash/plugins:
- gitfat_enabled: true
- upstream:
https://gerrit.wikimedia.org/r/operations/software/logstash/plugins
wikimedia/discovery/analytics:
upstream: https://gerrit.wikimedia.org/r/wikimedia/discovery/analytics
analytics/aqs/deploy:
diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index fa78973..d7296d7 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -74,3 +74,8 @@
librenms:
hosts:
- netmon1001.wikimedia.org
+ logstash:
+ hosts:
+ - logstash1001.eqiad.wmnet
+ - logstash1002.eqiad.wmnet
+ - logstash1003.eqiad.wmnet
diff --git a/hieradata/role/common/deployment_server.yaml
b/hieradata/role/common/deployment_server.yaml
index 729a5e3..9119669 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -60,6 +60,7 @@
- deploy-service
- aqs-admins
- deploy-aqs
+ - deployment
dumpsdeploy:
trusted_groups:
@@ -105,6 +106,8 @@
kartotherian/deploy:
repository: maps/kartotherian/deploy
# lvs_service: kartotherian
+ logstash/plugins:
+ repository: operations/software/logstash/plugins
analytics/pivot/deploy:
repository: analytics/pivot/deploy
mathoid/deploy: {}
diff --git a/modules/logstash/manifests/init.pp
b/modules/logstash/manifests/init.pp
index d84d6b3..c38d77a 100644
--- a/modules/logstash/manifests/init.pp
+++ b/modules/logstash/manifests/init.pp
@@ -27,8 +27,9 @@
require => Package[$java_package],
}
- package { 'logstash/plugins':
- provider => 'trebuchet',
+ # This creates the deploy-service user on targets
+ scap::target { 'logstash/plugins':
+ deploy_user => 'deploy-service',
}
$plugin_zip_path =
'/srv/deployment/logstash/plugins/target/releases/plugins-latest.zip'
--
To view, visit https://gerrit.wikimedia.org/r/354472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a90067d4e25ece7590aaf6d6f603ca5f2a7072b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
