From cde17346d57117329d37487b1da0746b969a5c65 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Wed, 11 Jan 2017 10:26:57 +0000 Subject: [PATCH] Version 5.0 - no need for plugin prefix --- tasks/elasticsearch-plugins.yml | 6 +++--- tasks/elasticsearch.yml | 5 ----- tasks/java.yml | 1 - tasks/main.yml | 1 + tasks/xpack/elasticsearch-xpack-install.yml | 4 ++-- tasks/xpack/elasticsearch-xpack.yml | 6 +++--- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/tasks/elasticsearch-plugins.yml b/tasks/elasticsearch-plugins.yml index 21fd92c..dd22194 100644 --- a/tasks/elasticsearch-plugins.yml +++ b/tasks/elasticsearch-plugins.yml @@ -12,7 +12,7 @@ #List currently installed plugins - ignore xpack if > v 2.0 - name: Check installed elasticsearch plugins - shell: "{{es_home}}/bin/{{ es_binary_prefix }}plugin {{list_command}}{% if es_version | version_compare('5.0', '<') %} | sed -n '1!p' | cut -d '-' -f2-{% endif %}{% if es_version | version_compare('2.0', '>') %} | grep -vE '{{supported_xpack_features | join('|')}}|license'{% endif %}" + shell: "{{es_home}}/bin/elasticsearch-plugin {{list_command}}{% if es_version | version_compare('5.0', '<') %} | sed -n '1!p' | cut -d '-' -f2-{% endif %}{% if es_version | version_compare('2.0', '>') %} | grep -vE '{{supported_xpack_features | join('|')}}|license'{% endif %}" register: installed_plugins failed_when: "'ERROR' in installed_plugins.stdout" changed_when: False @@ -23,7 +23,7 @@ # This removes any currently installed plugins (to prevent errors when reinstalling) - name: Remove elasticsearch plugins - command: "{{es_home}}/bin/{{ es_binary_prefix }}plugin remove {{item}} --silent" + command: "{{es_home}}/bin/elasticsearch-plugin remove {{item}} --silent" ignore_errors: yes with_items: "{{ installed_plugins.stdout_lines | default([]) }}" when: es_plugins_reinstall and installed_plugins.stdout_lines | length > 0 and not 'No plugin detected' in installed_plugins.stdout_lines[0] @@ -35,7 +35,7 @@ - name: Install elasticsearch plugins command: > - {{es_home}}/bin/{{ es_binary_prefix }}plugin install {{ item.plugin }}{% if item.version is defined and item.version != '' %}/{{ item.version }}{% endif %} {% if item.proxy_host is defined and item.proxy_host != '' and item.proxy_port is defined and item.proxy_port != ''%} -DproxyHost={{ item.proxy_host }} -DproxyPort={{ item.proxy_port }} {% elif es_proxy_host is defined and es_proxy_host != '' %} -DproxyHost={{ es_proxy_host }} -DproxyPort={{ es_proxy_port }} {% endif %} --silent + {{es_home}}/bin/elasticsearch-plugin install {{ item.plugin }}{% if item.version is defined and item.version != '' %}/{{ item.version }}{% endif %} {% if item.proxy_host is defined and item.proxy_host != '' and item.proxy_port is defined and item.proxy_port != ''%} -DproxyHost={{ item.proxy_host }} -DproxyPort={{ item.proxy_port }} {% elif es_proxy_host is defined and es_proxy_host != '' %} -DproxyHost={{ es_proxy_host }} -DproxyPort={{ es_proxy_port }} {% endif %} --silent register: plugin_installed failed_when: "'ERROR' in plugin_installed.stdout" changed_when: plugin_installed.rc == 0 diff --git a/tasks/elasticsearch.yml b/tasks/elasticsearch.yml index 8fe5895..e2361d4 100644 --- a/tasks/elasticsearch.yml +++ b/tasks/elasticsearch.yml @@ -1,10 +1,5 @@ --- -- set_fact: es_binary_prefix="" - -- set_fact: es_binary_prefix="elasticsearch-" - when: es_version | version_compare('5.0', '>=') - - name: Include optional user and group creation. when: (es_user_id is defined) and (es_group_id is defined) include: elasticsearch-optional-user.yml diff --git a/tasks/java.yml b/tasks/java.yml index ed49fb1..a940cc2 100644 --- a/tasks/java.yml +++ b/tasks/java.yml @@ -1,6 +1,5 @@ --- - - set_fact: java_state="present" - set_fact: java_state="latest" diff --git a/tasks/main.yml b/tasks/main.yml index ebf67b3..e8395da 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -13,6 +13,7 @@ when: es_java_install tags: - java + - include: elasticsearch.yml tags: - install diff --git a/tasks/xpack/elasticsearch-xpack-install.yml b/tasks/xpack/elasticsearch-xpack-install.yml index 88b439f..c309421 100644 --- a/tasks/xpack/elasticsearch-xpack-install.yml +++ b/tasks/xpack/elasticsearch-xpack-install.yml @@ -1,7 +1,7 @@ --- #Test if feature is installed -- shell: "{{es_home}}/bin/{{ es_binary_prefix }}plugin list{% if es_version | version_compare('5.0', '<') %} | sed -n '1!p' | cut -d '-' -f2-{% endif %} | grep {{item}}" +- shell: "{{es_home}}/bin/elasticsearch-plugin list{% if es_version | version_compare('5.0', '<') %} | sed -n '1!p' | cut -d '-' -f2-{% endif %} | grep {{item}}" register: feature_installed changed_when: False failed_when: "'ERROR' in feature_installed.stdout" @@ -27,7 +27,7 @@ #Install plugin if not installed, or the es version has changed (so removed above), and its been requested - name: Install {{item}} plugin command: > - {{es_home}}/bin/{{ es_binary_prefix }}plugin install {{item}} + {{es_home}}/bin/elasticsearch-plugin install {{item}} register: xpack_state failed_when: "'ERROR' in xpack_state.stdout" changed_when: xpack_state.rc == 0 diff --git a/tasks/xpack/elasticsearch-xpack.yml b/tasks/xpack/elasticsearch-xpack.yml index f081e5f..4dac838 100644 --- a/tasks/xpack/elasticsearch-xpack.yml +++ b/tasks/xpack/elasticsearch-xpack.yml @@ -7,7 +7,7 @@ #Check if license is installed - name: Check License plugin is installed shell: > - {{es_home}}/bin/{{ es_binary_prefix }}plugin list | tail -n +2 | grep license + {{es_home}}/bin/elasticsearch-plugin list | tail -n +2 | grep license register: license_installed ignore_errors: yes failed_when: "'ERROR' in license_installed.stdout" @@ -19,7 +19,7 @@ #Remove license if installed and xpack not enabled - name: Remove license plugin command: > - {{es_home}}/bin/{{ es_binary_prefix }}plugin remove license + {{es_home}}/bin/elasticsearch-plugin remove license register: xpack_state failed_when: "'ERROR' in xpack_state.stdout" changed_when: xpack_state.rc == 0 @@ -32,7 +32,7 @@ #Install License if not installed, or it needs to be reinstalled due to ES change (above task will have removed), and its been requested. - name: Install license plugin command: > - {{es_home}}/bin/{{ es_binary_prefix }}plugin install license + {{es_home}}/bin/elasticsearch-plugin install license register: xpack_state failed_when: "'ERROR' in xpack_state.stdout" changed_when: xpack_state.rc == 0