From: Martin Polreich Date: Wed, 19 Dec 2018 11:05:08 +0000 (+0000) Subject: Merge "Updating reference from github to gerrit - Changing Maintainer to dev... X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=5b25bd905a3ffaa26ddaa8be95d58e19a8a4c1b1;hp=2649b586a27b2bbc18ce9e515b5c474e47250cbb Merge "Updating reference from github to gerrit - Changing Maintainer to dev@mirantis.com" --- 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: