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

Fix for plugin version check

Browse source
This commit is contained in:
Dale McDiarmid 2016-07-24 16:17:39 +01:00
parent 57fa9e432b
commit 0a269a3d82
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tasks/elasticsearch-plugins.yml
View file

@ -11,7 +11,7 @@
when: es_version | version_compare('2.0', '<') when: es_version | version_compare('2.0', '<')
#List currently installed plugins - ignore xpack if > v 2.0 #List currently installed plugins - ignore xpack if > v 2.0
- shell: "{{es_home}}/bin/plugin {{list_command}} | sed -n '1!p' | cut -d '-' -f2-{% if {{es_version}} | version_compare('2.0', '>') %} | grep -vE 'shield|watcher|marvel-agent|graph'{% endif %}" - shell: "{{es_home}}/bin/plugin {{list_command}} | sed -n '1!p' | cut -d '-' -f2-{% if es_version | version_compare('2.0', '>') %} | grep -vE '{{supported_xpack_features | join('|')}}'{% endif %}"
register: installed_plugins register: installed_plugins
changed_when: False changed_when: False
ignore_errors: yes ignore_errors: yes

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

@ -110,7 +110,7 @@ shared_examples 'xpack::init' do |es_version|
describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep watcher') do describe command('curl -s localhost:9200/_nodes/plugins?pretty=true -u es_admin:changeMe | grep watcher') do
its(:exit_status) { should eq 0 } its(:exit_status) { should eq 0 }
end end
#test we haven't installed graph or marvel-agent #test we haven't installed graph or marvel-agent
describe file('/usr/share/elasticsearch/plugins/graph') do describe file('/usr/share/elasticsearch/plugins/graph') do