From d9a86b5d06e4b4921dab3d405ad78521204581ea Mon Sep 17 00:00:00 2001 From: Robin Clarke Date: Fri, 22 May 2015 21:11:33 +0200 Subject: [PATCH] Allow es_heap_size to be defined --- defaults/main.yml | 1 + tasks/elasticsearch-Debian.yml | 5 +++++ tasks/elasticsearch-RedHat.yml | 5 ++++- tasks/elasticsearch.yml | 5 +++-- tasks/main.yml | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1b707e0..9d7e2c2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -2,3 +2,4 @@ es_major_version: "1.5" es_version: "1.5.2" es_start_service: true +es_plugins_reinstall: false diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml index 85c22cc..682b90d 100644 --- a/tasks/elasticsearch-Debian.yml +++ b/tasks/elasticsearch-Debian.yml @@ -6,3 +6,8 @@ - name: Debian - Ensure elasticsearch is installed. apt: name=elasticsearch={{ es_version }} state=present cache_valid_time=86400 register: elasticsearch_install + +- name: Debian - configure memory + lineinfile: dest=/etc/default/elasticsearch regexp="^ES_HEAP_SIZE" insertafter="^#ES_HEAP_SIZE" line="ES_HEAP_SIZE={{ es_heap_size }}" + when: es_heap_size is defined + register: elasticsearch_configure diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml index c2d7223..04b359c 100644 --- a/tasks/elasticsearch-RedHat.yml +++ b/tasks/elasticsearch-RedHat.yml @@ -8,4 +8,7 @@ yum: name=elasticsearch-{{ es_version }} state=present update_cache=yes register: elasticsearch_install - +- name: RedHat - configure memory + lineinfile: dest=/etc/default/elasticsearch regexp="^ES_HEAP_SIZE" insertafter="^#ES_HEAP_SIZE" line="ES_HEAP_SIZE={{ es_heap_size }}" + when: es_heap_size is defined + register: elasticsearch_configure diff --git a/tasks/elasticsearch.yml b/tasks/elasticsearch.yml index 9aceb63..1d4073c 100644 --- a/tasks/elasticsearch.yml +++ b/tasks/elasticsearch.yml @@ -16,5 +16,6 @@ register: elasticsearch_started - name: Restart elasticsearch service if new version installed service: name=elasticsearch state=restarted - when: es_start_service and elasticsearch_install.changed and not elasticsearch_started.changed - + when: es_start_service and + ( elasticsearch_install.changed or elasticsearch_configure.changed ) + and not elasticsearch_started.changed diff --git a/tasks/main.yml b/tasks/main.yml index dad05c7..9ad4c63 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,3 +4,4 @@ - include: java.yml - include: elasticsearch.yml - include: elasticsearch-plugins.yml + when: es_plugins is defined