WIP: 6.3 support

tasks/elasticsearch-Debian.yml

@@ -27,7 +27,12 @@
 
 - name: Debian - Ensure elasticsearch is installed
   become: yes
-  apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present force={{force_install}} allow_unauthenticated={{ 'no' if es_apt_key else 'yes' }} cache_valid_time=86400
+  apt:
+    name: {{ es_package_name }}{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %}
+    state: present
+    force: {{force_install}}
+    allow_unauthenticated: {{ 'no' if es_apt_key else 'yes' }}
+    cache_valid_time: 86400
   when: es_use_repository
   register: debian_elasticsearch_install_from_repo
   notify: restart elasticsearch

tasks/elasticsearch-RedHat.yml

@@ -15,7 +15,10 @@
 
 - name: RedHat - Install Elasticsearch
   become: yes
-  yum: name=elasticsearch{% if es_version is defined and es_version != ""  %}-{{ es_version }}{% endif %} state=present update_cache=yes
+  yum:
+    name: {{ es_package_name }}{% if es_version is defined and es_version != ""  %}-{{ es_version }}{% endif %}
+    state: present
+    update_cache: yes
   when: es_use_repository
   register: redhat_elasticsearch_install_from_repo
   notify: restart elasticsearch

tasks/elasticsearch-plugins.yml

@@ -60,9 +60,8 @@
 
 - name: Install elasticsearch plugins
   become: yes
-  command: "{{es_home}}/bin/elasticsearch-plugin install {{ item.plugin }} --batch --silent"
+  command: "{{es_home}}/bin/elasticsearch-plugin install {{ item.url | default(item.plugin) }} --batch --silent"
   register: plugin_installed
-  failed_when: "'ERROR' in plugin_installed.stdout"
   changed_when: plugin_installed.rc == 0
   with_items: "{{ es_plugins }}"
   when: item.plugin in plugins_to_install

tasks/xpack/elasticsearch-xpack.yml

@@ -5,6 +5,7 @@
 
 - name: include elasticsearch-xpack-install.yml
   include: elasticsearch-xpack-install.yml
+  when: es_install_xpack
 
 #Security configuration
 - name: include security/elasticsearch-security.yml