From: Pavel Cizinsky <pcizinsky@mirantis.com>
Date: Tue, 15 Jan 2019 13:55:23 +0000 (+0000)
Subject: Merge "Drop Travis CI support"
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=a7c69234fedeb4cbb17196ba56c5b462895eba26;hp=47fcf8f5b541b4209da41bd85db7d3790a2d2960

Merge "Drop Travis CI support"
---

diff --git a/LICENSE b/LICENSE
index 6f2b42f..327cc68 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 tcp cloud a.s.
+Copyright (c) 2014-2019 Mirantis Inc. et al
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/README.rst b/README.rst
index a117a0b..21be912 100644
--- a/README.rst
+++ b/README.rst
@@ -209,36 +209,3 @@ Read more
 * http://alex.nederlof.com/blog/2012/11/19/installing-elasticsearch-with-jenkins-on-ubuntu/
 * http://websightdesigns.com/wiki/Setting_up_Centralized_Event_Parsing_on_Ubuntu_12.04
 * https://gist.github.com/wingdspur/2026107
-
-Documentation and Bugs
-======================
-
-To learn how to install and update salt-formulas, consult the documentation
-available online at:
-
-    http://salt-formulas.readthedocs.io/
-
-In the unfortunate event that bugs are discovered, they should be reported to
-the appropriate issue tracker. Use Github issue tracker for specific salt
-formula:
-
-    https://github.com/salt-formulas/salt-formula-elasticsearch/issues
-
-For feature requests, bug reports or blueprints affecting entire ecosystem,
-use Launchpad salt-formulas project:
-
-    https://launchpad.net/salt-formulas
-
-You can also join salt-formulas-users team and subscribe to mailing list:
-
-    https://launchpad.net/~salt-formulas-users
-
-Developers wishing to work on the salt-formulas projects should always base
-their work on master branch and submit pull request against specific formula.
-
-    https://github.com/salt-formulas/salt-formula-elasticsearch
-
-Any questions or feedback is always welcome so feel free to join our IRC
-channel:
-
-    #salt-formulas @ irc.freenode.net
diff --git a/debian/control b/debian/control
index 090448c..336fc1e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
 Source: salt-formula-elasticsearch
-Maintainer: Jakub Pavlik <jakub.pavlik@tcpcloud.eu>
+Maintainer: Mirantis Dev <dev@mirantis.com>
 Section: admin
 Priority: optional
 Build-Depends: salt-master, python, python-yaml, debhelper (>= 9)
 Standards-Version: 3.9.6
-Homepage: http://www.tcpcloud.eu
-Vcs-Browser: https://github.com/tcpcloud/salt-formula-elasticsearch
-Vcs-Git: https://github.com/tcpcloud/salt-formula-elasticsearch.git
+Homepage: https://www.mirantis.com
+Vcs-Browser: https://gerrit.mcp.mirantis.com/#/admin/projects/salt-formulas/elasticsearch
+Vcs-Git: https://gerrit.mcp.mirantis.com/salt-formulas/elasticsearch.git
 
 Package: salt-formula-elasticsearch
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index b98e252..c2f24c7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: salt-formula-elasticsearch
-Upstream-Contact: Jakub Pavlik <jakub.pavlik@tcpcloud.eu>
-Source: https://github.com/tcpcloud/salt-formula-elasticsearch
+Upstream-Contact: Mirantis Dev <dev@mirantis.com>
+Source: https://gerrit.mcp.mirantis.com/#/admin/projects/salt-formulas/elasticsearch
 
 Files: *
-Copyright: 2014-2015 tcp cloud
+Copyright: 2014-2019 Mirantis Inc. et al
 License: Apache-2.0
-  Copyright (C) 2014-2015 tcp cloud
+  Copyright (C) 2014-2019 Mirantis Inc. et al
   .
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
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:
diff --git a/metadata.yml b/metadata.yml
index 3378890..b66c2d7 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
 name: "elasticsearch"
 version: "0.2"
-source: "https://github.com/salt-formulas/salt-formula-elasticsearch"
+source: "https://gerrit.mcp.mirantis.com/salt-formulas/elasticsearch"