[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch: remove precise support

2017-03-31 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/345552 )

Change subject: elasticsearch: remove precise support
..


elasticsearch: remove precise support

Remove support for Ubuntu precise, not used anymore.

Change-Id: If00d942fd0686badef5b5b6054c33b46eff17e89
---
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/manifests/packages.pp
2 files changed, 11 insertions(+), 15 deletions(-)

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



diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index ff4f2c7..7c050b6 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -279,15 +279,13 @@
 ensure => absent,
 }
 
-# Cluster management tool, trusty only
-if os_version('ubuntu >= trusty || debian >= jessie') {
-file { '/usr/local/bin/es-tool':
-ensure  => file,
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-source  => 'puppet:///modules/elasticsearch/es-tool',
-require => [Package['python-elasticsearch'], 
Package['python-ipaddr']],
-}
+# Cluster management tool
+file { '/usr/local/bin/es-tool':
+ensure  => file,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
+source  => 'puppet:///modules/elasticsearch/es-tool',
+require => [Package['python-elasticsearch'], Package['python-ipaddr']],
 }
 }
diff --git a/modules/elasticsearch/manifests/packages.pp 
b/modules/elasticsearch/manifests/packages.pp
index 332d52e..feef8df 100644
--- a/modules/elasticsearch/manifests/packages.pp
+++ b/modules/elasticsearch/manifests/packages.pp
@@ -16,11 +16,9 @@
 
 require_package('curl')
 
-# library for elasticsearch. only in trusty+
-if os_version('ubuntu >= trusty || debian >= jessie') {
-require_package('python-elasticsearch')
-require_package('python-ipaddr')
-}
+# library for elasticsearch
+require_package('python-elasticsearch')
+require_package('python-ipaddr')
 
 ### install and link additional log4j appender to send logs over GELF
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If00d942fd0686badef5b5b6054c33b46eff17e89
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Giuseppe Lavagetto 
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]: elasticsearch: remove precise support

2017-03-30 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345552 )

Change subject: elasticsearch: remove precise support
..

elasticsearch: remove precise support

Remove support for Ubuntu precise, not used anymore.

Change-Id: If00d942fd0686badef5b5b6054c33b46eff17e89
---
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/manifests/packages.pp
2 files changed, 11 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/345552/1

diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 1b4b606..45b7fc2 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -269,15 +269,13 @@
 ensure => absent,
 }
 
-# Cluster management tool, trusty only
-if os_version('ubuntu >= trusty || debian >= jessie') {
-file { '/usr/local/bin/es-tool':
-ensure  => file,
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-source  => 'puppet:///modules/elasticsearch/es-tool',
-require => [Package['python-elasticsearch'], 
Package['python-ipaddr']],
-}
+# Cluster management tool
+file { '/usr/local/bin/es-tool':
+ensure  => file,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
+source  => 'puppet:///modules/elasticsearch/es-tool',
+require => [Package['python-elasticsearch'], Package['python-ipaddr']],
 }
 }
diff --git a/modules/elasticsearch/manifests/packages.pp 
b/modules/elasticsearch/manifests/packages.pp
index 332d52e..feef8df 100644
--- a/modules/elasticsearch/manifests/packages.pp
+++ b/modules/elasticsearch/manifests/packages.pp
@@ -16,11 +16,9 @@
 
 require_package('curl')
 
-# library for elasticsearch. only in trusty+
-if os_version('ubuntu >= trusty || debian >= jessie') {
-require_package('python-elasticsearch')
-require_package('python-ipaddr')
-}
+# library for elasticsearch
+require_package('python-elasticsearch')
+require_package('python-ipaddr')
 
 ### install and link additional log4j appender to send logs over GELF
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If00d942fd0686badef5b5b6054c33b46eff17e89
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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