commit 535fcd008eee7ec5d11f8d788f7d48514db56bfb
author Jenkins <jenkins@review.openstack.org> Wed Jan 06 20:04:34 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jan 06 20:04:34 2016 +0000
tree 25ed96b3fec4dbb8f6953206af8cee2474a8b21f
parent 21c873818716716a17fa698df9dc98d7f5623a5d
parent 3809defb2e3e66b7b9ad1cd9a827c14ba16f8ce7

Merge "Fix elastic search support for Fedora."

pkg/elasticsearch.sh

diff --git a/pkg/elasticsearch.sh b/pkg/elasticsearch.sh
index 7488306..9c4f6f7 100755
--- a/pkg/elasticsearch.sh
+++ b/pkg/elasticsearch.sh
@@ -88,10 +88,7 @@
         sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb
         sudo update-rc.d elasticsearch defaults 95 10
     elif is_fedora; then
-            is_package_installed java-1.8.0-openjdk-headless || install_package java-1.8.0-openjdk-headless
-        else
-            is_package_installed java-1.7.0-openjdk-headless || install_package java-1.7.0-openjdk-headless
-        fi
+        is_package_installed java-1.8.0-openjdk-headless || install_package java-1.8.0-openjdk-headless
         yum_install ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.noarch.rpm
         sudo /bin/systemctl daemon-reload
         sudo /bin/systemctl enable elasticsearch.service