From 60cc77f497540dafb05f5efd327bcb176b3ee3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Thu, 28 Oct 2021 11:55:05 -0300
Subject: [PATCH] ES start timeout parameterized

---
 .../ansible-elasticsearch/defaults/main.yml        |  1 +
 .../ansible-elasticsearch/tasks/main.yml           | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
index e82c3141..f1a8b01e 100644
--- a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
@@ -7,6 +7,7 @@ elasticsearch_jvm_xms: null
 elastic_stack_version: 7.10.2
 elasticsearch_lower_disk_requirements: false
 elasticsearch_path_repo: []
+elasticsearch_start_timeout: 90
 
 elasticrepo:
   apt: 'https://artifacts.elastic.co/packages/7.x/apt'
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
index c0e8ca22..05032350 100755
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
@@ -107,6 +107,14 @@
     - ansible_distribution == "Ubuntu"
     - ansible_distribution_major_version | int == 14
 
+- name: Ensure extra time for Elasticsearch to start on reboots
+  ansible.builtin.lineinfile:
+    path: /usr/lib/systemd/system/elasticsearch.service
+    regexp: '^TimeoutStartSec='
+    line: "TimeoutStartSec={{ elasticsearch_start_timeout }}"
+  become: yes
+  tags: configure
+
 - name: Ensure Elasticsearch started and enabled
   service:
     name: elasticsearch
@@ -160,3 +168,9 @@
   failed_when: http_response.status != 200
   when:
     - elasticsearch_xpack_users is defined
+
+- name: Reload systemd configuration
+  systemd:
+    daemon_reload: true
+  become: yes
+  notify: restart elasticsearch