Skip to content

Commit 5d78541

Browse files
author
gingerwizard
committed
Merge pull request elastic#54 from gingerwizard/master
Fix for when plugins are not defined
2 parents 0767456 + 731d4b2 commit 5d78541

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,3 +198,4 @@ all supported platforms.
198198
* The role aims to be idempotent. Running the role multiple times, with no changes, should result in no state change on the server. If the configuration is changed, these will be applied and
199199
Elasticsearch restarted where required.
200200
* Systemd is used for Ubuntu versions >= 15, Debian >=8, Centos >=7. All other versions use init for service scripts.
201+

handlers/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
- name: restart elasticsearch
33
service: name={{instance_init_script | basename}} state=restarted enabled=yes
4-
when: es_start_service and (not elasticsearch_started.changed or plugin_installed.changed)
4+
when: es_start_service and (not elasticsearch_started.changed or (plugin_installed is defined and plugin_installed.changed))

tasks/elasticsearch-templates.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
2-
#TODO: How to handle in multi node
3-
# 1. Template directory needs to be specifiable
2+
43
- name: Copy templates to elasticsearch
54
copy: src=templates dest=/etc/elasticsearch/ owner={{ es_user }} group={{ es_group }}
65

tasks/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
- include: elasticsearch-scripts.yml
1111
when: es_scripts
1212
- include: elasticsearch-templates.yml
13-
when: es_templates
13+
when: es_templates
14+
- meta: flush_handlers

0 commit comments

Comments
 (0)