jenkins-bot has submitted this change and it was merged.
Change subject: Adding CirrusSearch role
......................................................................
Adding CirrusSearch role
Bug: 54137
Change-Id: I73f8c4cc8e1f498520087948c7ac13cadfbad5c2
---
M puppet/manifests/packages.pp
M puppet/manifests/roles.pp
2 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/packages.pp b/puppet/manifests/packages.pp
index 588887e..af2fd3c 100644
--- a/puppet/manifests/packages.pp
+++ b/puppet/manifests/packages.pp
@@ -48,3 +48,7 @@
class packages::ocaml_native_compilers {
package { 'ocaml-native-compilers': }
}
+
+class packages::elasticsearch {
+ package { 'elasticsearch': }
+}
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index b2df868..70d6a83 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -578,3 +578,24 @@
},
}
}
+
+# == Class: role::cirrussearch
+# The CirrusSearch extension implements searching for MediaWiki using
Elasticsearch.
+class role::cirrussearch {
+ include role::mediawiki
+ include packages::elasticsearch
+
+ @mediawiki::extension { 'Elastica': }
+
+ @mediawiki::extension { 'CirrusSearch':
+ require => Package['elasticsearch'],
+ }
+
+ exec { 'update elastica submodule':
+ cwd => "${mediawiki::dir}/extensions/Elastica",
+ command => 'git submodule update --init Elastica',
+ require => Mediawiki::Extension['Elastica'],
+ unless => 'git submodule status Elastica | grep -q head',
+ before => Mediawiki::Extension['CirrusSearch'],
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/88255
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73f8c4cc8e1f498520087948c7ac13cadfbad5c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
