Add support for dynamic scripting

This change is required for the Telemetry plugin that leverages dynamic
scripting.

Change-Id: I330cd17fbd5867b3e3180b4ac6dbfe79dde50f43
This commit is contained in:
Roman Babyuk 2016-09-20 10:38:00 +03:00 committed by Simon Pasquier
parent db94ccbc8c
commit 46bada8ee6
3 changed files with 12 additions and 0 deletions

View File

@ -37,6 +37,12 @@ class { 'lma_logging_analytics::elasticsearch':
minimum_master_nodes => hiera('lma::elasticsearch::minimum_master_nodes'),
recover_after_time => hiera('lma::elasticsearch::recover_after_time'),
recover_after_nodes => hiera('lma::elasticsearch::recover_after_nodes'),
# The Telemetry plugin creates values for 'script_inline' and 'script_indexed' in hiera if enabled
# default value is 'sandbox';
# related documentation:
# https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html#enable-dynamic-scripting
script_inline => hiera('lma::elasticsearch::script_inline', 'sandbox'),
script_indexed => hiera('lma::elasticsearch::script_indexed', 'sandbox'),
version => '2.3.3',
require => Package[$java],
}

View File

@ -28,6 +28,8 @@ class lma_logging_analytics::elasticsearch (
$heap_size = 1,
$listen_port = 9200,
$version = 'latest',
$script_inline = 'sandbox',
$script_indexed = 'sandbox',
){
validate_bool($is_master)
@ -73,6 +75,8 @@ class lma_logging_analytics::elasticsearch (
'http.bind_host' => $listen_address,
'transport.bind_host' => $listen_address,
'transport.publish_host' => $listen_address,
'script.inline' => $script_inline,
'script.indexed' => $script_indexed,
}
# Start an instance of elasticsearch
::elasticsearch::instance { $instance_name:

View File

@ -172,6 +172,8 @@
version: 2.0.0
requires: [elasticsearch-haproxy]
required_for: [deploy_end]
cross-depends:
- name: telemetry-hiera
parameters:
puppet_manifest: puppet/manifests/elasticsearch.pp
puppet_modules: puppet/modules:/etc/puppet/modules