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

Merge remote-tracking branch 'elastic/master'

Browse source 
# Conflicts:
#	meta/main.yml
This commit is contained in:
Dale McDiarmid 2016-08-30 11:58:36 +01:00
parent 8915d5f9a5
commit d94808d7e2
5 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tasks/elasticsearch-Debian.yml
View file

@ -13,6 +13,10 @@
apt_repository: repo="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present
when: es_use_repository
- name: Debian - include versionlock
include: elasticsearch-Debian-version-lock.yml
when: es_version_lock
- name: Debian - Ensure elasticsearch is installed
apt: name=elasticsearch{% if es_version is defined and es_version != "" %}={{ es_version }}{% endif %} state=present force={{force_install}} cache_valid_time=86400
when: es_use_repository

10
tasks/elasticsearch-version-lock.yml
View file

@ -1,10 +0,0 @@
---
# Trigger Debian section
- name: Include Debian specific Elasticsearch
include: elasticsearch-Debian-version-lock.yml
when: ansible_os_family == 'Debian'
# Trigger Redhat section
- name: Include RedHat specific Elasticsearch
include: elasticsearch-RedHat-version-lock.yml
when: ansible_os_family == 'RedHat'