Gehel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391817 )
Change subject: Use apt components for elastic ...................................................................... Use apt components for elastic Change-Id: I6e0fb4ea5a66100d1f2f0823fff318e03fc89431 --- M puppet/modules/role/manifests/cirrussearch.pp 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Gehel: Looks good to me, approved diff --git a/puppet/modules/role/manifests/cirrussearch.pp b/puppet/modules/role/manifests/cirrussearch.pp index 4d034c3..b56c510 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 @@ -16,7 +15,14 @@ include ::role::svg include ::role::sitematrix # necessary for CirrusSearch.php.erb to point to service root dir - require ::service + include ::service + + apt::repository { 'wikimedia-elastic': + uri => 'http://apt.wikimedia.org/wikimedia', + dist => "${::lsbdistcodename}-wikimedia", + components => 'component/elastic55 thirdparty/elastic55', + #before => Class['::elasticsearch'], + } # Elasticsearch plugins (for search) package { 'wmf-elasticsearch-search-plugins': -- To view, visit https://gerrit.wikimedia.org/r/391817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e0fb4ea5a66100d1f2f0823fff318e03fc89431 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: DCausse <dcau...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org> Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits