summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Babyuk <rbabyuk@mirantis.com>2016-09-20 10:38:00 +0300
committerSimon Pasquier <spasquier@mirantis.com>2016-09-23 14:37:54 +0000
commit46bada8ee6e983417648f19f9ff4c685c48d84b1 (patch)
treeb74d63efbe622e98ad98a18f743bae15b2567f6e
parentdb94ccbc8c53eebbd62cf14a8cbd166e81494980 (diff)
Add support for dynamic scripting
This change is required for the Telemetry plugin that leverages dynamic scripting. Change-Id: I330cd17fbd5867b3e3180b4ac6dbfe79dde50f43
Notes
Notes (review): Code-Review+2: Simon Pasquier <spasquier@mirantis.com> Code-Review+2: Guillaume Thouvenin <gthouvenin@mirantis.com> Workflow+1: Guillaume Thouvenin <gthouvenin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 26 Sep 2016 07:01:43 +0000 Reviewed-on: https://review.openstack.org/372992 Project: openstack/fuel-plugin-elasticsearch-kibana Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/manifests/elasticsearch.pp6
-rw-r--r--deployment_scripts/puppet/modules/lma_logging_analytics/manifests/elasticsearch.pp4
-rw-r--r--deployment_tasks.yaml2
3 files changed, 12 insertions, 0 deletions
diff --git a/deployment_scripts/puppet/manifests/elasticsearch.pp b/deployment_scripts/puppet/manifests/elasticsearch.pp
index 6000194..7aeb29d 100644
--- a/deployment_scripts/puppet/manifests/elasticsearch.pp
+++ b/deployment_scripts/puppet/manifests/elasticsearch.pp
@@ -37,6 +37,12 @@ class { 'lma_logging_analytics::elasticsearch':
37 minimum_master_nodes => hiera('lma::elasticsearch::minimum_master_nodes'), 37 minimum_master_nodes => hiera('lma::elasticsearch::minimum_master_nodes'),
38 recover_after_time => hiera('lma::elasticsearch::recover_after_time'), 38 recover_after_time => hiera('lma::elasticsearch::recover_after_time'),
39 recover_after_nodes => hiera('lma::elasticsearch::recover_after_nodes'), 39 recover_after_nodes => hiera('lma::elasticsearch::recover_after_nodes'),
40# The Telemetry plugin creates values for 'script_inline' and 'script_indexed' in hiera if enabled
41# default value is 'sandbox';
42# related documentation:
43# https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-scripting.html#enable-dynamic-scripting
44 script_inline => hiera('lma::elasticsearch::script_inline', 'sandbox'),
45 script_indexed => hiera('lma::elasticsearch::script_indexed', 'sandbox'),
40 version => '2.3.3', 46 version => '2.3.3',
41 require => Package[$java], 47 require => Package[$java],
42} 48}
diff --git a/deployment_scripts/puppet/modules/lma_logging_analytics/manifests/elasticsearch.pp b/deployment_scripts/puppet/modules/lma_logging_analytics/manifests/elasticsearch.pp
index a68dd92..e808d56 100644
--- a/deployment_scripts/puppet/modules/lma_logging_analytics/manifests/elasticsearch.pp
+++ b/deployment_scripts/puppet/modules/lma_logging_analytics/manifests/elasticsearch.pp
@@ -28,6 +28,8 @@ class lma_logging_analytics::elasticsearch (
28 $heap_size = 1, 28 $heap_size = 1,
29 $listen_port = 9200, 29 $listen_port = 9200,
30 $version = 'latest', 30 $version = 'latest',
31 $script_inline = 'sandbox',
32 $script_indexed = 'sandbox',
31){ 33){
32 34
33 validate_bool($is_master) 35 validate_bool($is_master)
@@ -73,6 +75,8 @@ class lma_logging_analytics::elasticsearch (
73 'http.bind_host' => $listen_address, 75 'http.bind_host' => $listen_address,
74 'transport.bind_host' => $listen_address, 76 'transport.bind_host' => $listen_address,
75 'transport.publish_host' => $listen_address, 77 'transport.publish_host' => $listen_address,
78 'script.inline' => $script_inline,
79 'script.indexed' => $script_indexed,
76 } 80 }
77 # Start an instance of elasticsearch 81 # Start an instance of elasticsearch
78 ::elasticsearch::instance { $instance_name: 82 ::elasticsearch::instance { $instance_name:
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 275999e..923f413 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -172,6 +172,8 @@
172 version: 2.0.0 172 version: 2.0.0
173 requires: [elasticsearch-haproxy] 173 requires: [elasticsearch-haproxy]
174 required_for: [deploy_end] 174 required_for: [deploy_end]
175 cross-depends:
176 - name: telemetry-hiera
175 parameters: 177 parameters:
176 puppet_manifest: puppet/manifests/elasticsearch.pp 178 puppet_manifest: puppet/manifests/elasticsearch.pp
177 puppet_modules: puppet/modules:/etc/puppet/modules 179 puppet_modules: puppet/modules:/etc/puppet/modules