From 3809defb2e3e66b7b9ad1cd9a827c14ba16f8ce7 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Wed, 6 Jan 2016 08:19:24 +0000 Subject: [PATCH] Fix elastic search support for Fedora. Change Ifbcc3dd783ff2f362a464fbf4ca22f20cc2c658e broken it [1] [1] https://review.openstack.org/#/c/251980/2/pkg/elasticsearch.sh Change-Id: I330498cd490f3af2e9a569d86e8639a03b48dd17 Closes-Bug: #1531424 --- pkg/elasticsearch.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/elasticsearch.sh b/pkg/elasticsearch.sh index 7488306845..9c4f6f7801 100755 --- a/pkg/elasticsearch.sh +++ b/pkg/elasticsearch.sh @@ -88,10 +88,7 @@ function install_elasticsearch { 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