clean es_xpack_conf_subdir variable

This variable was added to manage specific x-pack dir with version < 6.3
This commit is contained in:
Julien Mailleret 2019-09-05 10:06:26 +02:00
parent abaf124639
commit 0f601259c6
No known key found for this signature in database
GPG key ID: F065093271C8DE71
4 changed files with 11 additions and 12 deletions

View file

@ -4,13 +4,13 @@ vars = JSON.parse(File.read('/tmp/vars.json'))
shared_examples 'xpack_upgrade::init' do |vars|
#Test users file, users_roles and roles.yml
describe file("/etc/elasticsearch/#{vars['es_xpack_conf_subdir']}/users_roles") do
describe file("/etc/elasticsearch/users_roles") do
it { should be_owned_by 'elasticsearch' }
it { should contain 'admin:es_admin' }
it { should contain 'power_user:testUser' }
end
describe file("/etc/elasticsearch/#{vars['es_xpack_conf_subdir']}/users") do
describe file("/etc/elasticsearch/users") do
it { should be_owned_by 'elasticsearch' }
it { should contain 'testUser:' }
it { should contain 'es_admin:' }
@ -36,7 +36,7 @@ shared_examples 'xpack_upgrade::init' do |vars|
end
#Test contents of role_mapping.yml
describe file("/etc/elasticsearch/#{vars['es_xpack_conf_subdir']}/role_mapping.yml") do
describe file("/etc/elasticsearch/role_mapping.yml") do
it { should be_owned_by 'elasticsearch' }
it { should contain 'power_user:' }
it { should contain '- cn=admins,dc=example,dc=com' }