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

Formatting and removal of unneccessary line

Browse source
This commit is contained in:
Dale McDiarmid 2016-03-21 22:39:15 +00:00
parent bc4ee9e0f1
commit 9b916ccaf5
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
defaults/main.yml
View file

@ -16,5 +16,4 @@ es_pid_dir: "/var/run/elasticsearch"
es_data_dirs: "/var/lib/elasticsearch" es_data_dirs: "/var/lib/elasticsearch"
es_log_dir: "/var/log/elasticsearch" es_log_dir: "/var/log/elasticsearch"
es_work_dir: "/tmp/elasticsearch" es_work_dir: "/tmp/elasticsearch"
es_plugin_dir: "/usr/share/elasticsearch/plugins" es_plugin_dir: "/usr/share/elasticsearch/plugins"
es_proxy_port: 8080

9
tasks/elasticsearch-plugins.yml
View file

@ -30,14 +30,7 @@
- name: Install elasticsearch plugins - name: Install elasticsearch plugins
#debug: var=item #debug: var=item
command: > command: >
{{es_home}}/bin/plugin install {{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
{{ 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 register: plugin_installed
failed_when: "'ERROR' in plugin_installed.stdout" failed_when: "'ERROR' in plugin_installed.stdout"
changed_when: plugin_installed.rc == 0 changed_when: plugin_installed.rc == 0