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 1/3] 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

From 04f3ec1aab596d5f23dbedff561be1f084fe7e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Thu, 28 Oct 2021 14:36:40 -0300
Subject: [PATCH 2/3] elasticsearch_start_timeout parameter added for OD
 installation

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

diff --git a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
index 2a6b7043..615a7ddc 100644
--- a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml
@@ -10,6 +10,7 @@ elasticsearch_network_host: '0.0.0.0'
 elasticsearch_node_master: true
 elasticsearch_node_data: true
 elasticsearch_node_ingest: true
+elasticsearch_start_timeout: 90
 
 elasticsearch_lower_disk_requirements: false
 elasticsearch_cluster_nodes:
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
index 463b78e6..0a5d5161 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
@@ -54,6 +54,14 @@
       notify: restart elasticsearch
       tags: install
 
+    - 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
@@ -100,4 +108,10 @@
 
     - import_tasks: "RMRedHat.yml"
       when: ansible_os_family == "RedHat"
+
+    - name: Reload systemd configuration
+      systemd:
+        daemon_reload: true
+      become: yes
+      notify: restart elasticsearch
   when: perform_installation

From 8f6e10232491af140ad15b6373ae06579eb9b4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Thu, 28 Oct 2021 15:01:49 -0300
Subject: [PATCH 3/3] lineinfile module corrected

---
 roles/elastic-stack/ansible-elasticsearch/tasks/main.yml | 2 +-
 roles/opendistro/opendistro-elasticsearch/tasks/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
index 05032350..040f6818 100755
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
@@ -108,7 +108,7 @@
     - ansible_distribution_major_version | int == 14
 
 - name: Ensure extra time for Elasticsearch to start on reboots
-  ansible.builtin.lineinfile:
+  lineinfile:
     path: /usr/lib/systemd/system/elasticsearch.service
     regexp: '^TimeoutStartSec='
     line: "TimeoutStartSec={{ elasticsearch_start_timeout }}"
diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
index 0a5d5161..a8dc20ee 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml
@@ -55,7 +55,7 @@
       tags: install
 
     - name: Ensure extra time for Elasticsearch to start on reboots
-      ansible.builtin.lineinfile:
+      lineinfile:
         path: /usr/lib/systemd/system/elasticsearch.service
         regexp: '^TimeoutStartSec='
         line: "TimeoutStartSec={{ elasticsearch_start_timeout }}"