From 7a2f0b43d22bbd17ba65f17493b1cdf73818f009 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Tue, 30 Aug 2016 12:30:54 +0100 Subject: [PATCH 1/2] Merged changes from 138 --- defaults/main.yml | 2 ++ tasks/elasticsearch-Debian.yml | 6 +++--- tasks/elasticsearch-plugins.yml | 5 +---- tasks/elasticsearch-templates.yml | 5 +++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 10adc43..7883b9e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,6 +3,8 @@ es_major_version: "2.x" es_version: "2.3.4" es_version_lock: false es_use_repository: true +es_apt_key: "http://packages.elasticsearch.org/GPG-KEY-elasticsearch" +es_apt_url: "deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" es_start_service: true es_java_install: true update_java: false diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml index 07e3088..1a8ed44 100644 --- a/tasks/elasticsearch-Debian.yml +++ b/tasks/elasticsearch-Debian.yml @@ -6,11 +6,11 @@ when: es_allow_downgrades - name: Debian - Add Elasticsearch repository key - apt_key: url="http://packages.elasticsearch.org/GPG-KEY-elasticsearch" state=present - when: es_use_repository + apt_key: url="{{ es_apt_key }}" state=present + when: es_use_repository and es_apt_key - name: Debian - add elasticsearch repository - apt_repository: repo="deb http://packages.elastic.co/elasticsearch/{{ es_major_version }}/debian stable main" state=present + apt_repository: repo="{{ es_apt_url }}" state=present when: es_use_repository - name: Debian - include versionlock diff --git a/tasks/elasticsearch-plugins.yml b/tasks/elasticsearch-plugins.yml index 0a0f36d..afcbb1a 100644 --- a/tasks/elasticsearch-plugins.yml +++ b/tasks/elasticsearch-plugins.yml @@ -4,8 +4,6 @@ # i.e. we have changed ES version(or we have clean installation of ES), or if no plugins listed. Otherwise it is false and requires explicitly setting. - set_fact: es_plugins_reinstall={{ ((elasticsearch_install_from_package is defined and elasticsearch_install_from_repo.changed) or (elasticsearch_install_from_package is defined and elasticsearch_install_from_package.changed)) or es_plugins is not defined or es_plugins is none }} -- debug: msg="{{es_plugins_reinstall}}" - - set_fact: list_command="list" - set_fact: list_command="--list" @@ -49,5 +47,4 @@ #Set permissions on plugins directory - name: Set Plugin Directory Permissions - file: state=directory path={{ es_home }}/plugins owner={{ es_user }} group={{ es_group }} recurse=yes - when: es_enable_xpack \ No newline at end of file + file: state=directory path={{ plugin_dir }} owner={{ es_user }} group={{ es_group }} recurse=yes diff --git a/tasks/elasticsearch-templates.yml b/tasks/elasticsearch-templates.yml index 76a471d..d709cc0 100644 --- a/tasks/elasticsearch-templates.yml +++ b/tasks/elasticsearch-templates.yml @@ -9,7 +9,8 @@ - name: Copy templates to elasticsearch copy: src={{ item }} dest=/etc/elasticsearch/templates owner={{ es_user }} group={{ es_group }} - when: es_templates_fileglob is defined notify: load-templates with_fileglob: - - "{{ es_templates_fileglob }}" \ No newline at end of file + - "{{ es_templates_fileglob | default('') }}" + + From 907198d65281e47bf5de78760ee1b4f7f04dea56 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Tue, 30 Aug 2016 12:55:45 +0100 Subject: [PATCH 2/2] Remove errorenous reference to es_plugin_dir --- tasks/elasticsearch-plugins.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/elasticsearch-plugins.yml b/tasks/elasticsearch-plugins.yml index afcbb1a..c2a70a7 100644 --- a/tasks/elasticsearch-plugins.yml +++ b/tasks/elasticsearch-plugins.yml @@ -47,4 +47,4 @@ #Set permissions on plugins directory - name: Set Plugin Directory Permissions - file: state=directory path={{ plugin_dir }} owner={{ es_user }} group={{ es_group }} recurse=yes + file: state=directory path={{ es_home }}/plugins owner={{ es_user }} group={{ es_group }} recurse=yes