From: Dmitry Kalashnik <dkalashnik@mirantis.com>
Date: Thu, 13 Dec 2018 15:05:59 +0000 (+0400)
Subject: Add jre as extlisit requirement for elasticsearch
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=refs%2Fheads%2Frelease%2F2019.101.1;hp=8c207eaf594db1a33c230b261541f7890aec5746

Add jre as extlisit requirement for elasticsearch

To avoid installation issue caused by
https://github.com/elastic/elasticsearch/issues/31845

Change-Id: I96ff31ac5a33225fa3c552d2208bf263bf3b95f6
Closes-Bug: PROD-25839
---

diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index 93b3f07..0e5ae3c 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -2,6 +2,7 @@
 Debian:
   pkgs:
   - elasticsearch
+  dependency_pkgs:
   - default-jre-headless
   curator_pkgs:
   - elasticsearch-curator
@@ -10,6 +11,8 @@ Debian:
 RedHat:
   pkgs:
   - elasticsearch
+  dependency_pkgs:
+  - java-1.8.0-openjdk-headless
   curator_pkgs:
   - elasticsearch-curator
   service: elasticsearch
diff --git a/elasticsearch/server/init.sls b/elasticsearch/server/init.sls
index 7995faf..e8ae754 100644
--- a/elasticsearch/server/init.sls
+++ b/elasticsearch/server/init.sls
@@ -6,9 +6,15 @@ include:
   - elasticsearch.server.curator
 {%- endif %}
 
+elasticsearch_dependency_packages:
+  pkg.installed:
+  - names: {{ server.dependency_pkgs }}
+
 elasticsearch_packages:
   pkg.installed:
   - names: {{ server.pkgs }}
+  - require:
+    - pkg: elasticsearch_dependency_packages
 
 elasticsearch_default:
   file.managed: