Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390433 )

Change subject: logstash: dedicated components in our APT repository
......................................................................


logstash: dedicated components in our APT repository

Since we now have components dedicated to elastic in our APT repo, it
is now time to use them.

Note: the same implementation is done after moving logstash to role /
profiles (https://gerrit.wikimedia.org/r/#/c/390402/), but it is blocked
by https://gerrit.wikimedia.org/r/#/c/390039/ (T180257).

Bug: T179964
Change-Id: I2fa32b858f9c18ccb48f6aa911fdccef5335419a
---
M modules/role/manifests/logstash/elasticsearch.pp
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/logstash/elasticsearch.pp 
b/modules/role/manifests/logstash/elasticsearch.pp
index c81695c..fd2c6d4 100644
--- a/modules/role/manifests/logstash/elasticsearch.pp
+++ b/modules/role/manifests/logstash/elasticsearch.pp
@@ -24,6 +24,13 @@
         mode   => '0755',
     }
 
+    apt::repository { 'wikimedia-elastic':
+        uri        => 'http://apt.wikimedia.org/wikimedia',
+        dist       => "${::lsbdistcodename}-wikimedia",
+        components => 'component/elastic55 thirdparty/elastic55',
+        before     => Class['::elasticsearch'],
+    }
+
     class { '::elasticsearch':
         require                    => File['/usr/share/elasticsearch/plugins'],
         curator_uses_unicast_hosts => false, # elasticsearch API is only 
exposed to localhost

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2fa32b858f9c18ccb48f6aa911fdccef5335419a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to