diff --git a/deployment_scripts/puppet/manifests/elasticsearch.pp b/deployment_scripts/puppet/manifests/elasticsearch.pp index 5f70d24..b7eaa57 100644 --- a/deployment_scripts/puppet/manifests/elasticsearch.pp +++ b/deployment_scripts/puppet/manifests/elasticsearch.pp @@ -38,5 +38,6 @@ 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'), + version => '2.3.3', require => Package[$java], } 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 8138a21..a68dd92 100644 --- a/deployment_scripts/puppet/modules/lma_logging_analytics/manifests/elasticsearch.pp +++ b/deployment_scripts/puppet/modules/lma_logging_analytics/manifests/elasticsearch.pp @@ -27,6 +27,7 @@ class lma_logging_analytics::elasticsearch ( $is_data = true, $heap_size = 1, $listen_port = 9200, + $version = 'latest', ){ validate_bool($is_master) @@ -43,6 +44,7 @@ class lma_logging_analytics::elasticsearch ( # Install elasticsearch class { '::elasticsearch': + version => $version, datadir => "${data_dir}/elasticsearch_data", init_defaults => { 'MAX_LOCKED_MEMORY' => 'unlimited', diff --git a/deployment_scripts/puppet/modules/lma_logging_analytics/spec/classes/lma_logging_analytics_elasticsearch_spec.rb b/deployment_scripts/puppet/modules/lma_logging_analytics/spec/classes/lma_logging_analytics_elasticsearch_spec.rb index cda9989..296ea0c 100644 --- a/deployment_scripts/puppet/modules/lma_logging_analytics/spec/classes/lma_logging_analytics_elasticsearch_spec.rb +++ b/deployment_scripts/puppet/modules/lma_logging_analytics/spec/classes/lma_logging_analytics_elasticsearch_spec.rb @@ -18,7 +18,7 @@ describe 'lma_logging_analytics::elasticsearch', :type => :class do {:kernel => 'Linux', :operatingsystem => 'Ubuntu'} end - describe 'minmal parameter' do + describe 'minimal parameters' do let(:params) do {:listen_address => '127.0.0.1', :data_dir => '/tmp/es-data', @@ -26,10 +26,14 @@ describe 'lma_logging_analytics::elasticsearch', :type => :class do :cluster_name => 'es-cluster', :instance_name => 'es-42', :nodes => ['node-1', 'node-2', 'foo-host'], + :version => '5.0.0', } 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_file('/tmp/es-data').with( :ensure => 'directory'