Ottomata has submitted this change and it was merged.
Change subject: Use ruby json lib to render Arrays as strings in druid
runtime.properties.erb
......................................................................
Use ruby json lib to render Arrays as strings in druid runtime.properties.erb
Labs uses a different version of Ruby, and this is not a problem there.
Bug: T131974
Change-Id: I822155973464d05b9127bfdbc88d7af072520417
---
M modules/druid/manifests/init.pp
M modules/druid/templates/runtime.properties.erb
2 files changed, 7 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/druid/manifests/init.pp b/modules/druid/manifests/init.pp
index 9c6ada4..30e39ea 100644
--- a/modules/druid/manifests/init.pp
+++ b/modules/druid/manifests/init.pp
@@ -235,11 +235,6 @@
$metadata_extensions,
$storage_extensions
))
- notify { "extenstions: '${extensions}'": }
- $e = inline_template('extensions: "<%= @extensions %>" : <%=
@extensions.class %>')
- notify { "${e}": }
- $e2 = inline_template('extensions to s: "<%= @extensions.to_s %>"')
- notify { "${e2}": }
$default_properties = {
'druid.indexer.logs.type' => 'file',
diff --git a/modules/druid/templates/runtime.properties.erb
b/modules/druid/templates/runtime.properties.erb
index 09c80b3..bf3f4d7 100644
--- a/modules/druid/templates/runtime.properties.erb
+++ b/modules/druid/templates/runtime.properties.erb
@@ -1,5 +1,11 @@
# NOTE: This file is managed by Puppet.
+<%
+# WMF's Puppet's version of Ruby's Array.to_s does not render
+# A useful sting. Instead, the json library will be used to render
+# Array values.
+require 'json'
+-%>
<% @runtime_properties.keys.sort.each do |key| -%>
-<%= key %>=<%= @runtime_properties[key] %>
+<%= key %>=<%= @runtime_properties[key].class == Array ?
@runtime_properties[key].to_json : @runtime_properties[key] %>
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/291137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I822155973464d05b9127bfdbc88d7af072520417
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <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
