DCausse has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391817 )
Change subject: [WIP] use apt components for elastic
......................................................................
[WIP] use apt components for elastic
Change-Id: I6e0fb4ea5a66100d1f2f0823fff318e03fc89431
---
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/role/manifests/cirrussearch.pp
2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/17/391817/1
diff --git a/puppet/modules/elasticsearch/manifests/init.pp
b/puppet/modules/elasticsearch/manifests/init.pp
index 3525d9a..1977eb8 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -6,6 +6,13 @@
class elasticsearch {
require_package('openjdk-8-jre-headless')
+ apt::repository { 'wikimedia-elastic':
+ uri => 'http://apt.wikimedia.org/wikimedia',
+ dist => "${::lsbdistcodename}-wikimedia",
+ components => 'component/elastic55 thirdparty/elastic55',
+ before => Class['::elasticsearch'],
+ }
+
package { 'elasticsearch':
ensure => latest,
}
diff --git a/puppet/modules/role/manifests/cirrussearch.pp
b/puppet/modules/role/manifests/cirrussearch.pp
index 4d034c3..7381d42 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -7,7 +7,6 @@
include ::role::pdfhandler
include ::role::cite
include ::elasticsearch
- include ::apt::wikimedia_experimental
include ::eventschemas
# Utilized as part of cirrus logging infrastructure
include ::role::psr3
--
To view, visit https://gerrit.wikimedia.org/r/391817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e0fb4ea5a66100d1f2f0823fff318e03fc89431
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
