From 9b916ccaf5f2870993115230c519fba510015f53 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Mon, 21 Mar 2016 22:39:15 +0000 Subject: [PATCH] Formatting and removal of unneccessary line --- defaults/main.yml | 3 +-- tasks/elasticsearch-plugins.yml | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c2e4a94..7bf9af0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,5 +16,4 @@ es_pid_dir: "/var/run/elasticsearch" es_data_dirs: "/var/lib/elasticsearch" es_log_dir: "/var/log/elasticsearch" es_work_dir: "/tmp/elasticsearch" -es_plugin_dir: "/usr/share/elasticsearch/plugins" -es_proxy_port: 8080 \ No newline at end of file +es_plugin_dir: "/usr/share/elasticsearch/plugins" \ No newline at end of file diff --git a/tasks/elasticsearch-plugins.yml b/tasks/elasticsearch-plugins.yml index 1240882..8347c23 100644 --- a/tasks/elasticsearch-plugins.yml +++ b/tasks/elasticsearch-plugins.yml @@ -30,14 +30,7 @@ - name: Install elasticsearch plugins #debug: var=item command: > - {{es_home}}/bin/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/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