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

6.x should not have path.conf present

Browse source
This commit is contained in:
Michael Russell 2018-01-31 08:17:44 +01:00
parent 94b059080b
commit 043c1bff69
No known key found for this signature in database
GPG key ID: A90C1696496085FE
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,11 @@ shared_examples 'config::init' do |vars|
it { should contain 'node.name: node1' } it { should contain 'node.name: node1' }
it { should contain 'bootstrap.memory_lock: true' } it { should contain 'bootstrap.memory_lock: true' }
it { should contain 'discovery.zen.ping.unicast.hosts: localhost:9501' } it { should contain 'discovery.zen.ping.unicast.hosts: localhost:9501' }
if vars['es_major_version'] == '6.x'
it { should_not contain 'path.conf: /etc/elasticsearch/node1' }
else
it { should contain 'path.conf: /etc/elasticsearch/node1' } it { should contain 'path.conf: /etc/elasticsearch/node1' }
end
it { should contain 'path.data: /opt/elasticsearch/data-1/localhost-node1,/opt/elasticsearch/data-2/localhost-node1' } it { should contain 'path.data: /opt/elasticsearch/data-1/localhost-node1,/opt/elasticsearch/data-2/localhost-node1' }
it { should contain 'path.logs: /opt/elasticsearch/logs/localhost-node1' } it { should contain 'path.logs: /opt/elasticsearch/logs/localhost-node1' }
end end

10
test/integration/helpers/serverspec/multi_spec.rb
View file

@ -29,7 +29,11 @@ shared_examples 'multi::init' do |vars|
it { should contain 'node.master: false' } it { should contain 'node.master: false' }
it { should contain 'node.name: localhost-node1' } it { should contain 'node.name: localhost-node1' }
it { should_not contain 'bootstrap.memory_lock: true' } it { should_not contain 'bootstrap.memory_lock: true' }
if vars['es_major_version'] == '6.x'
it { should_not contain 'path.conf: /etc/elasticsearch/node1' }
else
it { should contain 'path.conf: /etc/elasticsearch/node1' } it { should contain 'path.conf: /etc/elasticsearch/node1' }
end
it { should contain 'path.data: /opt/elasticsearch/data-1/localhost-node1,/opt/elasticsearch/data-2/localhost-node1' } it { should contain 'path.data: /opt/elasticsearch/data-1/localhost-node1,/opt/elasticsearch/data-2/localhost-node1' }
it { should contain 'path.logs: /var/log/elasticsearch/localhost-node1' } it { should contain 'path.logs: /var/log/elasticsearch/localhost-node1' }
end end
@ -44,7 +48,11 @@ shared_examples 'multi::init' do |vars|
it { should contain 'node.master: true' } it { should contain 'node.master: true' }
it { should contain 'node.name: localhost-master' } it { should contain 'node.name: localhost-master' }
it { should contain 'bootstrap.memory_lock: true' } it { should contain 'bootstrap.memory_lock: true' }
it { should contain 'path.conf: /etc/elasticsearch/master' } if vars['es_major_version'] == '6.x'
it { should_not contain 'path.conf: /etc/elasticsearch/node1' }
else
it { should contain 'path.conf: /etc/elasticsearch/node1' }
end
it { should contain 'path.data: /opt/elasticsearch/master/localhost-master' } it { should contain 'path.data: /opt/elasticsearch/master/localhost-master' }
it { should contain 'path.logs: /var/log/elasticsearch/localhost-master' } it { should contain 'path.logs: /var/log/elasticsearch/localhost-master' }
end end

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

@ -29,7 +29,11 @@ shared_examples 'xpack::init' do |vars|
describe file('/etc/elasticsearch/security_node/elasticsearch.yml') do describe file('/etc/elasticsearch/security_node/elasticsearch.yml') do
it { should contain 'node.name: localhost-security_node' } it { should contain 'node.name: localhost-security_node' }
it { should contain 'cluster.name: elasticsearch' } it { should contain 'cluster.name: elasticsearch' }
it { should contain 'path.conf: /etc/elasticsearch/security_node' } if vars['es_major_version'] == '6.x'
it { should_not contain 'path.conf: /etc/elasticsearch/node1' }
else
it { should contain 'path.conf: /etc/elasticsearch/node1' }
end
it { should contain 'path.data: /var/lib/elasticsearch/localhost-security_node' } it { should contain 'path.data: /var/lib/elasticsearch/localhost-security_node' }
it { should contain 'path.logs: /var/log/elasticsearch/localhost-security_node' } it { should contain 'path.logs: /var/log/elasticsearch/localhost-security_node' }
end end

6
test/integration/helpers/serverspec/xpack_standard_spec.rb
View file

@ -27,7 +27,11 @@ shared_examples 'xpack_standard::init' do |vars|
describe file('/etc/elasticsearch/security_node/elasticsearch.yml') do describe file('/etc/elasticsearch/security_node/elasticsearch.yml') do
it { should contain 'node.name: localhost-security_node' } it { should contain 'node.name: localhost-security_node' }
it { should contain 'cluster.name: elasticsearch' } it { should contain 'cluster.name: elasticsearch' }
it { should contain 'path.conf: /etc/elasticsearch/security_node' } if vars['es_major_version'] == '6.x'
it { should_not contain 'path.conf: /etc/elasticsearch/node1' }
else
it { should contain 'path.conf: /etc/elasticsearch/node1' }
end
it { should contain 'path.data: /var/lib/elasticsearch/localhost-security_node' } it { should contain 'path.data: /var/lib/elasticsearch/localhost-security_node' }
it { should contain 'path.logs: /var/log/elasticsearch/localhost-security_node' } it { should contain 'path.logs: /var/log/elasticsearch/localhost-security_node' }
it { should contain 'xpack.security.enabled: false' } it { should contain 'xpack.security.enabled: false' }