Allow es_heap_size to be defined

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

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

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

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

tasks/main.yml

@@ -4,3 +4,4 @@
 - include: java.yml
 - include: elasticsearch.yml
 - include: elasticsearch-plugins.yml
+  when: es_plugins is defined