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

Merge pull request #142 from gingerwizard/master

Browse source 
Merged changes from 138
This commit is contained in:
Dale McDiarmid 2016-08-30 13:08:06 +01:00 • committed by GitHub
commit de29766c9a
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
defaults/main.yml
View file

@ -3,6 +3,8 @@ es_major_version: "2.x"
es_version: "2.3.4" es_version: "2.3.4"
es_version_lock: false es_version_lock: false
es_use_repository: true es_use_repository: true
es_apt_key: "http://packages.elasticsearch.org/GPG-KEY-elasticsearch"
es_apt_url: "deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main"
es_start_service: true es_start_service: true
es_java_install: true es_java_install: true
update_java: false update_java: false

6
tasks/elasticsearch-Debian.yml
View file

@ -6,11 +6,11 @@
when: es_allow_downgrades when: es_allow_downgrades
- name: Debian - Add Elasticsearch repository key - name: Debian - Add Elasticsearch repository key
apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present apt_key: url="{{ es_apt_key }}" state=present
when: es_use_repository when: es_use_repository and es_apt_key
- name: Debian - add elasticsearch repository - name: Debian - add elasticsearch repository
apt_repository: repo="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present apt_repository: repo="{{ es_apt_url }}" state=present
when: es_use_repository when: es_use_repository
- name: Debian - include versionlock - name: Debian - include versionlock

3
tasks/elasticsearch-plugins.yml
View file

@ -4,8 +4,6 @@
# 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. # 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={{ ((elasticsearch_install_from_package is defined and elasticsearch_install_from_repo.changed) or (elasticsearch_install_from_package is defined and elasticsearch_install_from_package.changed)) or es_plugins is not defined or es_plugins is none }} - set_fact: es_plugins_reinstall={{ ((elasticsearch_install_from_package is defined and elasticsearch_install_from_repo.changed) or (elasticsearch_install_from_package is defined and elasticsearch_install_from_package.changed)) or es_plugins is not defined or es_plugins is none }}
- debug: msg="{{es_plugins_reinstall}}"
- set_fact: list_command="list" - set_fact: list_command="list"
- set_fact: list_command="--list" - set_fact: list_command="--list"
@ -50,4 +48,3 @@
#Set permissions on plugins directory #Set permissions on plugins directory
- name: Set Plugin Directory Permissions - name: Set Plugin Directory Permissions
file: state=directory path={{ es_home }}/plugins owner={{ es_user }} group={{ es_group }} recurse=yes file: state=directory path={{ es_home }}/plugins owner={{ es_user }} group={{ es_group }} recurse=yes
when: es_enable_xpack

5
tasks/elasticsearch-templates.yml
View file

@ -9,7 +9,8 @@
- name: Copy templates to elasticsearch - name: Copy templates to elasticsearch
copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }} copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }}
when: es_templates_fileglob is defined
notify: load-templates notify: load-templates
with_fileglob: with_fileglob:
- "{{ es_templates_fileglob }}" - "{{ es_templates_fileglob | default('') }}"