santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #490 from elastic/five_is_the_new_six

Browse source 
Fix the tested path.conf for 5.x
This commit is contained in:
Michael Russell 2018-08-28 14:12:08 +02:00 • committed by GitHub
commit a95a48f02d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/integration/helpers/serverspec/xpack_spec.rb
View file

@ -5,9 +5,9 @@ shared_examples 'xpack::init' do |vars|
it { should contain "node.name: localhost-#{vars['es_instance_name']}" } it { should contain "node.name: localhost-#{vars['es_instance_name']}" }
it { should contain 'cluster.name: elasticsearch' } it { should contain 'cluster.name: elasticsearch' }
if vars['es_major_version'] == '6.x' if vars['es_major_version'] == '6.x'
it { should_not contain 'path.conf: /etc/elasticsearch/security_node' } it { should_not contain "path.conf: /etc/elasticsearch/#{vars['es_instance_name']}" }
else else
it { should contain 'path.conf: /etc/elasticsearch/security_node' } it { should contain "path.conf: /etc/elasticsearch/#{vars['es_instance_name']}" }
end end
it { should contain "path.data: /var/lib/elasticsearch/localhost-#{vars['es_instance_name']}" } it { should contain "path.data: /var/lib/elasticsearch/localhost-#{vars['es_instance_name']}" }
it { should contain "path.logs: /var/log/elasticsearch/localhost-#{vars['es_instance_name']}" } it { should contain "path.logs: /var/log/elasticsearch/localhost-#{vars['es_instance_name']}" }