Alexandros Kosiaris has submitted this change and it was merged.
Change subject: lucene: puppet 3 compatibility fix: fully qualify variable
......................................................................
lucene: puppet 3 compatibility fix: fully qualify variable
Change-Id: I424e006cd37ece2a8ab3590e2d33581b61d8c9b0
---
M manifests/search.pp
M templates/lucene/lsearch.log4j.erb
2 files changed, 18 insertions(+), 23 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/search.pp b/manifests/search.pp
index c333125..fe46c68 100644
--- a/manifests/search.pp
+++ b/manifests/search.pp
@@ -7,38 +7,19 @@
class lucene {
class server($indexer=false, $udplogging=true) {
- Class['lucene::config'] -> Class['lucene::server']
Class['lucene::packages'] -> Class['lucene::server']
+
+ require role::lucene::configuration
include passwords::lucene
$lucene_oai_pass = $passwords::lucene::oai_pass
include lucene::packages,
- lucene::config,
lucene::service
if $indexer == true {
include lucene::indexer
}
- }
-
- class packages {
- package { ['oracle-j2sdk1.6', 'libudp2log-log4j-java']:
- ensure => 'latest',
- }
- package { 'liblog4j1.2-java':
- ensure => 'latest',
- require => Package['oracle-j2sdk1.6'],
- }
- package { 'lucene-search-2':
- # Present instead of latest for controlled upgrade
- ensure => 'present',
- require => Package['oracle-j2sdk1.6'],
- }
- }
-
- class config {
- require role::lucene::configuration
file { '/a/search/conf/lsearch-global-2.1.conf':
ensure => 'present',
@@ -127,7 +108,21 @@
hour => '0',
minute => '0',
}
+ }
+ class packages {
+ package { ['oracle-j2sdk1.6', 'libudp2log-log4j-java']:
+ ensure => 'latest',
+ }
+ package { 'liblog4j1.2-java':
+ ensure => 'latest',
+ require => Package['oracle-j2sdk1.6'],
+ }
+ package { 'lucene-search-2':
+ # Present instead of latest for controlled upgrade
+ ensure => 'present',
+ require => Package['oracle-j2sdk1.6'],
+ }
}
class service {
diff --git a/templates/lucene/lsearch.log4j.erb
b/templates/lucene/lsearch.log4j.erb
index 101bdc0..55d6f39 100644
--- a/templates/lucene/lsearch.log4j.erb
+++ b/templates/lucene/lsearch.log4j.erb
@@ -1,5 +1,5 @@
# Set root logger level and its only appender to A1.
-log4j.rootLogger=INFO, A1<% if udplogging == true then -%>, udp2log<% end -%>
+log4j.rootLogger=INFO, A1<% if @udplogging == true then -%>, udp2log<% end -%>
# A1 is set to be a ConsoleAppender.
#log4j.appender.A1=org.apache.log4j.ConsoleAppender
@@ -18,7 +18,7 @@
# Log progress messages from the incremental indexer
log4j.logger.org.wikimedia.lsearch.oai.IncrementalUpdater=INFO
-<% if udplogging == true then -%>
+<% if @udplogging == true then -%>
# udp2log log4j appender.
# Logs to Oxygen's udp2log-lucene instance on port 51234
log4j.appender.udp2log=org.wikimedia.log4j.Udp2LogAppender
--
To view, visit https://gerrit.wikimedia.org/r/111520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I424e006cd37ece2a8ab3590e2d33581b61d8c9b0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
