[MediaWiki-commits] [Gerrit] operations/puppet[production]: logstash - upgrade to Java 8

[Gehel (Code Review)]

Gehel has submitted this change and it was merged.

Change subject: logstash - upgrade to Java 8
..


logstash - upgrade to Java 8

Bug: T151325
Change-Id: Id896c50efbc7e67a2cbf6934d8f0cc7b6efd9a34
---
M hieradata/labs.yaml
M modules/logstash/manifests/init.pp
M modules/role/manifests/logstash.pp
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Gehel: Looks good to me, approved
  DCausse: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 781852f..18a3920 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -31,7 +31,6 @@
 elasticsearch::expected_nodes: 1
 elasticsearch::recover_after_nodes: 1
 elasticsearch::java_package: 'openjdk-8-jdk'
-logstash::java_package: 'openjdk-8-jdk'
 archiva::proxy::ssl_enabled: false
 archiva::proxy::certificate_name: ssl-cert-snakeoil
 statsite::instance::graphite_host: 'labmon1001.eqiad.wmnet'
diff --git a/modules/logstash/manifests/init.pp 
b/modules/logstash/manifests/init.pp
index 4b26245..7a2a2da 100644
--- a/modules/logstash/manifests/init.pp
+++ b/modules/logstash/manifests/init.pp
@@ -18,7 +18,7 @@
 class logstash(
 $heap_memory_mb = 64,
 $filter_workers = 1,
-$java_package   = 'openjdk-7-jdk',
+$java_package   = 'openjdk-8-jdk',
 ) {
 require_package($java_package)
 
diff --git a/modules/role/manifests/logstash.pp 
b/modules/role/manifests/logstash.pp
index 59dd200..a0ac536 100644
--- a/modules/role/manifests/logstash.pp
+++ b/modules/role/manifests/logstash.pp
@@ -219,7 +219,8 @@
 }
 
 class { '::elasticsearch':
-require => Package['elasticsearch/plugins'],
+require  => Package['elasticsearch/plugins'],
+java_package => 'openjdk-8-jdk',
 }
 
 $logstash_nodes = hiera('logstash::cluster_hosts')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id896c50efbc7e67a2cbf6934d8f0cc7b6efd9a34
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: logstash - upgrade to Java 8

[Gehel (Code Review)]

Gehel has uploaded a new change for review.

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

Change subject: logstash - upgrade to Java 8
..

logstash - upgrade to Java 8

Bug: T151325
Change-Id: Id896c50efbc7e67a2cbf6934d8f0cc7b6efd9a34
---
M hieradata/labs.yaml
M modules/logstash/manifests/init.pp
M modules/role/manifests/logstash.pp
3 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/324704/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 781852f..18a3920 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -31,7 +31,6 @@
 elasticsearch::expected_nodes: 1
 elasticsearch::recover_after_nodes: 1
 elasticsearch::java_package: 'openjdk-8-jdk'
-logstash::java_package: 'openjdk-8-jdk'
 archiva::proxy::ssl_enabled: false
 archiva::proxy::certificate_name: ssl-cert-snakeoil
 statsite::instance::graphite_host: 'labmon1001.eqiad.wmnet'
diff --git a/modules/logstash/manifests/init.pp 
b/modules/logstash/manifests/init.pp
index 4b26245..7a2a2da 100644
--- a/modules/logstash/manifests/init.pp
+++ b/modules/logstash/manifests/init.pp
@@ -18,7 +18,7 @@
 class logstash(
 $heap_memory_mb = 64,
 $filter_workers = 1,
-$java_package   = 'openjdk-7-jdk',
+$java_package   = 'openjdk-8-jdk',
 ) {
 require_package($java_package)
 
diff --git a/modules/role/manifests/logstash.pp 
b/modules/role/manifests/logstash.pp
index 59dd200..8dea416 100644
--- a/modules/role/manifests/logstash.pp
+++ b/modules/role/manifests/logstash.pp
@@ -220,6 +220,7 @@
 
 class { '::elasticsearch':
 require => Package['elasticsearch/plugins'],
+java_package = 'openjdk-8-jdk',
 }
 
 $logstash_nodes = hiera('logstash::cluster_hosts')

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

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

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