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

fix for ES plugins install

Browse source
This commit is contained in:
Дехтярёв Евгений Артурович 2016-05-25 19:24:58 +06:00
parent e14ebe06ab
commit 01401f9d55
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
handlers/main.yml
View file

@ -1,4 +1,4 @@
- name: restart elasticsearch - name: restart elasticsearch
service: name={{instance_init_script | basename}} state=restarted enabled=yes service: name={{instance_init_script | basename}} state=restarted enabled=yes
when: es_restart_on_change and es_start_service and not elasticsearch_started.changed and ((plugin_installed is defined and plugin_installed.changed) or elasticsearch_install.changed) when: es_restart_on_change and es_start_service and not elasticsearch_started.changed and ((plugin_installed is defined and plugin_installed.changed) or (elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed))

4
tasks/elasticsearch-Debian.yml
View file

@ -10,7 +10,7 @@
- name: Debian - Ensure elasticsearch is installed - name: Debian - Ensure elasticsearch is installed
apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present cache_valid_time=86400 apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present cache_valid_time=86400
when: es_use_repository when: es_use_repository
register: elasticsearch_install register: elasticsearch_install_from_repo
- name: Debian - Download elasticsearch from url - name: Debian - Download elasticsearch from url
get_url: url={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.deb{% endif %} dest=/tmp/elasticsearch-{{ es_version }}.deb validate_certs=no get_url: url={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.deb{% endif %} dest=/tmp/elasticsearch-{{ es_version }}.deb validate_certs=no
@ -19,4 +19,4 @@
- name: Debian - Ensure elasticsearch is installed from downloaded package - name: Debian - Ensure elasticsearch is installed from downloaded package
apt: deb=/tmp/elasticsearch-{{ es_version }}.deb apt: deb=/tmp/elasticsearch-{{ es_version }}.deb
when: not es_use_repository when: not es_use_repository
register: elasticsearch_install register: elasticsearch_install_from_package

4
tasks/elasticsearch-RedHat.yml
View file

@ -14,9 +14,9 @@
- name: RedHat - Install Elasticsearch - name: RedHat - Install Elasticsearch
yum: name=elasticsearch{% if es_version is defined and es_version != "" %}-{{ es_version }}{% endif %} state=present update_cache=yes yum: name=elasticsearch{% if es_version is defined and es_version != "" %}-{{ es_version }}{% endif %} state=present update_cache=yes
when: es_use_repository when: es_use_repository
register: elasticsearch_install register: elasticsearch_install_from_repo
- name: RedHat - Install Elasticsearch from url - name: RedHat - Install Elasticsearch from url
yum: name={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.noarch.rpm{% endif %} state=present yum: name={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.noarch.rpm{% endif %} state=present
when: not es_use_repository when: not es_use_repository
register: elasticsearch_install register: elasticsearch_install_from_package

7
tasks/elasticsearch-plugins.yml
View file

@ -1,8 +1,9 @@
--- ---
#es_plugins_reinstall will be set to true if elasticsearch_install.changed i.e. we have changed ES version, or if no plugins listed. Otherwise it is false and requires explicitly setting. # es_plugins_reinstall will be set to true if elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed
# i.e. we have changed ES version(or we have clean installation of ES), or if no plugins listed. Otherwise it is false and requires explicitly setting.
- set_fact: es_plugins_reinstall=true - set_fact: es_plugins_reinstall=true
when: elasticsearch_install.changed or es_plugins is not defined or es_plugins is none when: (elasticsearch_install_from_repo.changed or elasticsearch_install_from_package.changed) or es_plugins is not defined or es_plugins is none
- set_fact: list_command="list" - set_fact: list_command="list"
- set_fact: list_command="--list" - set_fact: list_command="--list"
@ -35,7 +36,7 @@
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
with_items: "{{ es_plugins }}" with_items: "{{ es_plugins }}"
when: es_plugins is defined and not es_plugins is none when: es_plugins is defined and not es_plugins is none and es_plugins_reinstall
notify: restart elasticsearch notify: restart elasticsearch
environment: environment:
CONF_DIR: "{{ conf_dir }}" CONF_DIR: "{{ conf_dir }}"