From 0d80dde1ef4e048bf676fbeb14b04f455bd42666 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Fri, 8 Jul 2016 13:32:17 +0100 Subject: [PATCH 1/3] Initial Shield Files --- defaults/main.yml | 1 + tasks/elasticsearch-shield.yml | 3 +++ tasks/main.yml | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 tasks/elasticsearch-shield.yml diff --git a/defaults/main.yml b/defaults/main.yml index c120127..96095aa 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,6 +12,7 @@ es_templates: false es_user: elasticsearch es_group: elasticsearch es_config: {} +es_install_shield: false #Need to provide default directories es_pid_dir: "/var/run/elasticsearch" es_data_dirs: "/var/lib/elasticsearch" diff --git a/tasks/elasticsearch-shield.yml b/tasks/elasticsearch-shield.yml new file mode 100644 index 0000000..849169c --- /dev/null +++ b/tasks/elasticsearch-shield.yml @@ -0,0 +1,3 @@ +--- + + diff --git a/tasks/main.yml b/tasks/main.yml index 6b97512..a44de58 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -24,6 +24,8 @@ when: es_plugins is defined or es_plugins_reinstall tags: - plugins +- include: elasticsearch-shield.yml + when: es_install_shield - include: elasticsearch-service.yml tags: - service From 6160207b6f359a4aa732be701e4579238910598f Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Fri, 8 Jul 2016 14:49:21 +0100 Subject: [PATCH 2/3] Shield tag --- tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index a44de58..ca1dfce 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -26,6 +26,8 @@ - plugins - include: elasticsearch-shield.yml when: es_install_shield + tags: + - shield - include: elasticsearch-service.yml tags: - service From 59bdee229d6ba4c8d8261d97b930427ace41ab15 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Wed, 20 Jul 2016 12:47:34 +0100 Subject: [PATCH 3/3] Fix if template file globs are not defined --- tasks/elasticsearch-templates.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks/elasticsearch-templates.yml b/tasks/elasticsearch-templates.yml index ccc8b8d..c9de8bb 100644 --- a/tasks/elasticsearch-templates.yml +++ b/tasks/elasticsearch-templates.yml @@ -8,7 +8,9 @@ - name: Copy templates to elasticsearch 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 tags: