Fix for plugin version check

tasks/elasticsearch-plugins.yml

@@ -11,7 +11,7 @@
   when: es_version | version_compare('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
   changed_when: False
   ignore_errors: yes

test/integration/helpers/serverspec/xpack_spec.rb

@@ -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
     its(:exit_status) { should eq 0 }
   end
-  
+
   #test we haven't installed graph or marvel-agent
 
   describe file('/usr/share/elasticsearch/plugins/graph') do