Merge "Allow longer timeouts for elasticsearch.service"

elk_metrics_7x/roles/elasticsearch/defaults/main.yml

@@ -39,10 +39,14 @@ elastic_plugins:
 # of the available RAM for elasticsearch. The value is expected to be in MiB.
 # elastic_heap_size: 10240  # type `int`
 
-# Set the addresses/interfaces for elasticsearch to bind to. If undefined, this binds to
-# localhost and the ansible_host and ansible_hostname addresses.
+# Set the addresses/interfaces for elasticsearch to bind to. If undefined, this
+# binds to localhost and the ansible_host and ansible_hostname addresses.
 elasticsearch_bind_addresses: ["127.0.0.1", "{{ ansible_host }}", "{{ ansible_hostname }}"]
 
 # Set a master-eligible node to be voting only
 # By default this is set to False - all masters can be elected by default
 # elasticsearch_voting_only: true
+
+# Allow a slow startup before the systemd notifier module kicks in to extend
+# the timeout.
+#elastic_systemd_timeout: 75

elk_metrics_7x/roles/elasticsearch/templates/systemd.elasticsearch-overrides.conf.j2

@@ -12,3 +12,8 @@ LimitMEMLOCK=infinity
 
 # Number of File Descriptors
 LimitNOFILE=65536
+
+{% if elastic_systemd_timeout is defined %}
+# Allow a slow startup before the systemd notifier module kicks in to extend the timeout
+TimeoutStartSec={{ elastic_systemd_timeout }}
+{% endif %}

elk_metrics_7x/tests/test-vars.yml

@@ -20,5 +20,6 @@ physical_host: localhost
 q_storage: 1
 elastic_memory_lower_limit: 1024
 elastic_memory_upper_limit: 1024
+elastic_systemd_timeout: 240
 
 osa_test_repo: "openstack/openstack-ansible-ops"