Skip to content

Commit 0c6f326

Browse files
committed
Merge pull request elastic#31 from jakommo/master
Changed Readme and added template install
2 parents a11d095 + 04de4b1 commit 0c6f326

5 files changed

+23
-4
lines changed

defaults/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
es_major_version: "1.7"
3-
es_version: "1.7.0"
3+
es_version: "1.7.1"
44
es_version_lock: false
55
es_use_repository: true
66
es_start_service: true
77
es_plugins_reinstall: false
88
es_scripts: false
9+
es_templates: false
910
es_user: elasticsearch
1011
es_group: elasticsearch

tasks/elasticsearch-RedHat-version-lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
- name: RedHat - install yum-version-lock
33
yum: name=yum-plugin-versionlock state=present update_cache=yes
44
- name: RedHat - lock elasticsearch version
5-
command: yum versionlock add elasticsearch
5+
shell: yum versionlock delete 0:elasticsearch* ; yum versionlock add elasticsearch{% if es_version is defined and es_version != "" %}-{{ es_version }}{% endif %}
66

tasks/elasticsearch-RedHat.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
template: src=elasticsearch.repo dest=/etc/yum.repos.d/elasticsearch-{{ es_major_version }}.repo
88
when: es_use_repository
99

10+
- name: RedHat - include versionlock
11+
include: elasticsearch-RedHat-version-lock.yml
12+
when: es_version_lock
13+
1014
- name: RedHat - Install Elasticsearch
1115
yum: name=elasticsearch{% if es_version is defined and es_version != "" %}-{{ es_version }}{% endif %} state=present update_cache=yes
1216
when: es_use_repository

tasks/elasticsearch-templates.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
- name: Copy templates to elasticsearch
3+
copy: src=templates dest=/etc/elasticsearch/
4+
5+
- name: Wait for elasticsearch to startup
6+
wait_for: port=9200 delay=10
7+
8+
- name: Get template files
9+
shell: find . -maxdepth 1 -type f | sed "s#\./##" | sed "s/.json//" chdir=/etc/elasticsearch/templates
10+
register: resultstemplate
11+
12+
- name: Install template(s)
13+
command: 'curl -sL -XPUT http://localhost:9200/_template/{{item}} -d @/etc/elasticsearch/templates/{{item}}.json'
14+
with_items: resultstemplate.stdout_lines

tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
- include: elasticsearch.yml
44
- include: elasticsearch-plugins.yml
55
when: es_plugins is defined
6-
- include: elasticsearch-version-lock.yml
7-
when: es_version_lock
86
- include: elasticsearch-scripts.yml
97
when: es_scripts
8+
- include: elasticsearch-templates.yml
9+
when: es_templates
1010

0 commit comments

Comments
 (0)