BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399773 )
Change subject: elasticsearch: Use custom apt repo
......................................................................
elasticsearch: Use custom apt repo
Bug: T183305
Bug: T183071
Change-Id: I72f3237d8a054df5b64bb8f1a727bfbd37074bcc
---
M puppet/modules/elasticsearch/manifests/init.pp
A puppet/modules/elasticsearch/manifests/repository.pp
M puppet/modules/role/manifests/cirrussearch.pp
3 files changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/73/399773/1
diff --git a/puppet/modules/elasticsearch/manifests/init.pp
b/puppet/modules/elasticsearch/manifests/init.pp
index 3525d9a..e11bcd4 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -4,6 +4,8 @@
# engine, much like Solr, but with a more user-friendly inteface.
#
class elasticsearch {
+ require ::elasticsearch::repository
+
require_package('openjdk-8-jre-headless')
package { 'elasticsearch':
diff --git a/puppet/modules/elasticsearch/manifests/repository.pp
b/puppet/modules/elasticsearch/manifests/repository.pp
new file mode 100644
index 0000000..610e49f
--- /dev/null
+++ b/puppet/modules/elasticsearch/manifests/repository.pp
@@ -0,0 +1,10 @@
+# == Class: Elasticsearch::Repository
+#
+# Configure an atp repository to fetch elasticsearch packages from.
+class elasticsearch::repository {
+ apt::repository { 'wikimedia-elastic':
+ uri => 'http://apt.wikimedia.org/wikimedia',
+ dist => "${::lsbdistcodename}-wikimedia",
+ components => 'component/elastic55 thirdparty/elastic55',
+ }
+}
diff --git a/puppet/modules/role/manifests/cirrussearch.pp
b/puppet/modules/role/manifests/cirrussearch.pp
index b56c510..3b1d2d3 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -17,13 +17,6 @@
# necessary for CirrusSearch.php.erb to point to service root dir
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':
ensure => latest,
--
To view, visit https://gerrit.wikimedia.org/r/399773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72f3237d8a054df5b64bb8f1a727bfbd37074bcc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
