x
/
fuel-plugin-elasticsearch-kibana
Code Issues Proposed changes

Install explicit package version of Elasticsearch 

Change-Id: I2722a9c56b9fae33950714733a74f7557eb147e8
Related-bug: #1590013
This commit is contained in:
Swann Croiset 2016-06-08 15:54:36 +02:00
parent 6853f52c5c
commit 52476e669c
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment_scripts/puppet/manifests/elasticsearch.pp
View File

@ -38,5 +38,6 @@ class { 'lma_logging_analytics::elasticsearch':
minimum_master_nodes => hiera('lma::elasticsearch::minimum_master_nodes'), minimum_master_nodes => hiera('lma::elasticsearch::minimum_master_nodes'),
recover_after_time => hiera('lma::elasticsearch::recover_after_time'), recover_after_time => hiera('lma::elasticsearch::recover_after_time'),
recover_after_nodes => hiera('lma::elasticsearch::recover_after_nodes'), recover_after_nodes => hiera('lma::elasticsearch::recover_after_nodes'),
version => '2.3.3',
require => Package[$java], require => Package[$java],
} }

2
deployment_scripts/puppet/modules/lma_logging_analytics/manifests/elasticsearch.pp
View File

@ -27,6 +27,7 @@ class lma_logging_analytics::elasticsearch (
$is_data = true, $is_data = true,
$heap_size = 1, $heap_size = 1,
$listen_port = 9200, $listen_port = 9200,
$version = 'latest',
){ ){
validate_bool($is_master) validate_bool($is_master)
@ -43,6 +44,7 @@ class lma_logging_analytics::elasticsearch (
# Install elasticsearch # Install elasticsearch
class { '::elasticsearch': class { '::elasticsearch':
version => $version,
datadir => "${data_dir}/elasticsearch_data", datadir => "${data_dir}/elasticsearch_data",
init_defaults => { init_defaults => {
'MAX_LOCKED_MEMORY' => 'unlimited', 'MAX_LOCKED_MEMORY' => 'unlimited',

8
deployment_scripts/puppet/modules/lma_logging_analytics/spec/classes/lma_logging_analytics_elasticsearch_spec.rb
View File

@ -18,7 +18,7 @@ describe 'lma_logging_analytics::elasticsearch', :type => :class do
{:kernel => 'Linux', :operatingsystem => 'Ubuntu'} {:kernel => 'Linux', :operatingsystem => 'Ubuntu'}
end end
describe 'minmal parameter' do describe 'minimal parameters' do
let(:params) do let(:params) do
{:listen_address => '127.0.0.1', {:listen_address => '127.0.0.1',
:data_dir => '/tmp/es-data', :data_dir => '/tmp/es-data',
@ -26,10 +26,14 @@ describe 'lma_logging_analytics::elasticsearch', :type => :class do
:cluster_name => 'es-cluster', :cluster_name => 'es-cluster',
:instance_name => 'es-42', :instance_name => 'es-42',
:nodes => ['node-1', 'node-2', 'foo-host'], :nodes => ['node-1', 'node-2', 'foo-host'],
:version => '5.0.0',
} }
end end
it { is_expected.to contain_class('elasticsearch') } it { is_expected.to contain_class('elasticsearch').with(
:version => '5.0.0'
)}
it { is_expected.to contain_elasticsearch__instance('es-42') } it { is_expected.to contain_elasticsearch__instance('es-42') }
it { is_expected.to contain_file('/tmp/es-data').with( it { is_expected.to contain_file('/tmp/es-data').with(
:ensure => 'directory' :ensure => 'directory'