[MediaWiki-commits] [Gerrit] operations/puppet[production]: Cassandra: Switch logback-encoder to Scap3

2017-08-10 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366473 )

Change subject: Cassandra: Switch logback-encoder to Scap3
..


Cassandra: Switch logback-encoder to Scap3

Bug: T116340
Depends-On: I0726e183e494471dee6abc6d1eeb110113bad3f1
Change-Id: Iccc142cf6a97291e90db1bfb063543883b8bf431
---
M hieradata/common/role/deployment.yaml
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/deployment_server.yaml
M modules/cassandra/manifests/logging.pp
4 files changed, 14 insertions(+), 10 deletions(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/hieradata/common/role/deployment.yaml 
b/hieradata/common/role/deployment.yaml
index 5f04ce9..80d8fa1 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -26,9 +26,6 @@
 upstream: 
https://gerrit.wikimedia.org/r/operations/software/cassandra-metrics-collector
   sentry/sentry:
 upstream: https://gerrit.wikimedia.org/r/operations/software/sentry
-  cassandra/logstash-logback-encoder:
-gitfat_enabled: true
-upstream: 
https://gerrit.wikimedia.org/r/operations/software/logstash-logback-encoder
   wikimedia/discovery/analytics:
 upstream: https://gerrit.wikimedia.org/r/wikimedia/discovery/analytics
   analytics/aqs/deploy:
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 64ffd6d..953c7a8 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -325,6 +325,10 @@
   # Recommendation API
   recommendation-api/deploy: {}
 
+  # Cassandra logback encoder for Logstash
+  cassandra/logstash-logback-encoder:
+repository: operations/software/logstash-logback-encoder
+
   # Prometheus JMX exporter
   prometheus/jmx_exporter:
 repository: operations/software/prometheus_jmx_exporter
diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index 3c6a86d..3c864dc 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -146,6 +146,9 @@
 lvs_service: zotero
   zotero/translators:
 lvs_service: zotero
+  # Cassandra logback encoder for Logstash
+  cassandra/logstash-logback-encoder:
+repository: operations/software/logstash-logback-encoder
   # Time-window compaction strategy for Cassandra
   cassandra/twcs:
 repository: operations/software/cassandra-twcs
diff --git a/modules/cassandra/manifests/logging.pp 
b/modules/cassandra/manifests/logging.pp
index cf6b597..d70ac1f 100644
--- a/modules/cassandra/manifests/logging.pp
+++ b/modules/cassandra/manifests/logging.pp
@@ -10,33 +10,33 @@
 ) {
 require ::cassandra
 
-package { 'cassandra/logstash-logback-encoder':
-ensure   => present,
-provider => 'trebuchet',
+scap::target { 'cassandra/logstash-logback-encoder':
+deploy_user => 'deploy-service',
+manage_user => true,
 }
 
 file { '/usr/share/cassandra/lib/logstash-logback-encoder.jar':
 ensure  => 'link',
 target  => 
'/srv/deployment/cassandra/logstash-logback-encoder/lib/logstash-logback-encoder-4.2.jar',
-require => Package['cassandra/logstash-logback-encoder'],
+require => Scap::Target['cassandra/logstash-logback-encoder'],
 }
 
 file { '/usr/share/cassandra/lib/jackson-annotations-2.4.0.jar':
 ensure  => 'link',
 target  => 
'/srv/deployment/cassandra/logstash-logback-encoder/lib/jackson-annotations-2.4.0.jar',
-require => Package['cassandra/logstash-logback-encoder'],
+require => Scap::Target['cassandra/logstash-logback-encoder'],
 }
 
 file { '/usr/share/cassandra/lib/jackson-core-2.4.0.jar':
 ensure  => 'link',
 target  => 
'/srv/deployment/cassandra/logstash-logback-encoder/lib/jackson-core-2.4.0.jar',
-require => Package['cassandra/logstash-logback-encoder'],
+require => Scap::Target['cassandra/logstash-logback-encoder'],
 }
 
 file { '/usr/share/cassandra/lib/jackson-databind-2.4.0.jar':
 ensure  => 'link',
 target  => 
'/srv/deployment/cassandra/logstash-logback-encoder/lib/jackson-databind-2.4.0.jar',
-require => Package['cassandra/logstash-logback-encoder'],
+require => Scap::Target['cassandra/logstash-logback-encoder'],
 }
 
 # removes unnecessary dependencies, deprecates T128787; the following code

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iccc142cf6a97291e90db1bfb063543883b8bf431
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Eevans

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Cassandra: Switch logback-encoder to Scap3

2017-07-19 Thread Mobrovac (Code Review) 
Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366473 )

Change subject: Cassandra: Switch logback-encoder to Scap3
..

Cassandra: Switch logback-encoder to Scap3

Bug: T116340
Change-Id: Iccc142cf6a97291e90db1bfb063543883b8bf431
Depends-On: I0726e183e494471dee6abc6d1eeb110113bad3f1
---
M hieradata/common/role/deployment.yaml
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/deployment_server.yaml
M modules/cassandra/manifests/logging.pp
4 files changed, 14 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/366473/1

diff --git a/hieradata/common/role/deployment.yaml 
b/hieradata/common/role/deployment.yaml
index 5f04ce9..80d8fa1 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -26,9 +26,6 @@
 upstream: 
https://gerrit.wikimedia.org/r/operations/software/cassandra-metrics-collector
   sentry/sentry:
 upstream: https://gerrit.wikimedia.org/r/operations/software/sentry
-  cassandra/logstash-logback-encoder:
-gitfat_enabled: true
-upstream: 
https://gerrit.wikimedia.org/r/operations/software/logstash-logback-encoder
   wikimedia/discovery/analytics:
 upstream: https://gerrit.wikimedia.org/r/wikimedia/discovery/analytics
   analytics/aqs/deploy:
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index d64be24..d8662f3 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -315,6 +315,10 @@
   # Recommendation API
   recommendation-api/deploy: {}
 
+  # Cassandra logback encoder for Logstash
+  cassandra/logstash-logback-encoder:
+repository: operations/software/logstash-logback-encoder
+
 prometheus_nodes:
   - deployment-prometheus01.deployment-prep.eqiad.wmflabs
 profile::recommendation_api::wdqs_uri: http://wdqs-test.wmflabs.org
diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index 8fc5810..0612566 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -139,6 +139,9 @@
 lvs_service: zotero
   zotero/translators:
 lvs_service: zotero
+  # Cassandra logback encoder for Logstash
+  cassandra/logstash-logback-encoder:
+repository: operations/software/logstash-logback-encoder
   # Time-window compaction strategy for Cassandra
   cassandra/twcs:
 repository: operations/software/cassandra-twcs
diff --git a/modules/cassandra/manifests/logging.pp 
b/modules/cassandra/manifests/logging.pp
index cf6b597..d70ac1f 100644
--- a/modules/cassandra/manifests/logging.pp
+++ b/modules/cassandra/manifests/logging.pp
@@ -10,33 +10,33 @@
 ) {
 require ::cassandra
 
-package { 'cassandra/logstash-logback-encoder':
-ensure   => present,
-provider => 'trebuchet',
+scap::target { 'cassandra/logstash-logback-encoder':
+deploy_user => 'deploy-service',
+manage_user => true,
 }
 
 file { '/usr/share/cassandra/lib/logstash-logback-encoder.jar':
 ensure  => 'link',
 target  => 
'/srv/deployment/cassandra/logstash-logback-encoder/lib/logstash-logback-encoder-4.2.jar',
-require => Package['cassandra/logstash-logback-encoder'],
+require => Scap::Target['cassandra/logstash-logback-encoder'],
 }
 
 file { '/usr/share/cassandra/lib/jackson-annotations-2.4.0.jar':
 ensure  => 'link',
 target  => 
'/srv/deployment/cassandra/logstash-logback-encoder/lib/jackson-annotations-2.4.0.jar',
-require => Package['cassandra/logstash-logback-encoder'],
+require => Scap::Target['cassandra/logstash-logback-encoder'],
 }
 
 file { '/usr/share/cassandra/lib/jackson-core-2.4.0.jar':
 ensure  => 'link',
 target  => 
'/srv/deployment/cassandra/logstash-logback-encoder/lib/jackson-core-2.4.0.jar',
-require => Package['cassandra/logstash-logback-encoder'],
+require => Scap::Target['cassandra/logstash-logback-encoder'],
 }
 
 file { '/usr/share/cassandra/lib/jackson-databind-2.4.0.jar':
 ensure  => 'link',
 target  => 
'/srv/deployment/cassandra/logstash-logback-encoder/lib/jackson-databind-2.4.0.jar',
-require => Package['cassandra/logstash-logback-encoder'],
+require => Scap::Target['cassandra/logstash-logback-encoder'],
 }
 
 # removes unnecessary dependencies, deprecates T128787; the following code

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccc142cf6a97291e90db1bfb063543883b8bf431
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac