Merge pull request #120 from gingerwizard/master

Fix for template fileglob not being defined + initial shield files
This commit is contained in:
Dale McDiarmid 2016-07-20 12:49:21 +01:00 committed by GitHub
commit 407ad6223b
4 changed files with 11 additions and 1 deletions

View file

@ -12,6 +12,7 @@ es_templates: false
es_user: elasticsearch es_user: elasticsearch
es_group: elasticsearch es_group: elasticsearch
es_config: {} es_config: {}
es_install_shield: false
#Need to provide default directories #Need to provide default directories
es_pid_dir: "/var/run/elasticsearch" es_pid_dir: "/var/run/elasticsearch"
es_data_dirs: "/var/lib/elasticsearch" es_data_dirs: "/var/lib/elasticsearch"

View file

@ -0,0 +1,3 @@
---

View file

@ -8,7 +8,9 @@
- 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 }}
with_fileglob: "{{ es_templates_fileglob }}" when: es_templates_fileglob is defined
with_fileglob:
- "{{ es_templates_fileglob }}"
- set_fact: http_port=9200 - set_fact: http_port=9200
tags: tags:

View file

@ -24,6 +24,10 @@
when: es_plugins is defined or es_plugins_reinstall when: es_plugins is defined or es_plugins_reinstall
tags: tags:
- plugins - plugins
- include: elasticsearch-shield.yml
when: es_install_shield
tags:
- shield
- include: elasticsearch-service.yml - include: elasticsearch-service.yml
tags: tags:
- service - service