1. devstack
  2. Commit 3809defb2e3e66b7b9ad1cd9a827c14ba16f8ce7
Browse code

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

Federico Ressi authored on 2016/01/06 17:19:24
Showing 1 changed files
pkg/elasticsearch.sh
History View file @ 3809def
... ... 
@@ -88,10 +88,7 @@ function install_elasticsearch {
88 88 
         sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb
89 89 
         sudo update-rc.d elasticsearch defaults 95 10
90 90 
     elif is_fedora; then
91 
-            is_package_installed java-1.8.0-openjdk-headless || install_package java-1.8.0-openjdk-headless
92 
-        else
93 
-            is_package_installed java-1.7.0-openjdk-headless || install_package java-1.7.0-openjdk-headless
94 
-        fi
91 
+        is_package_installed java-1.8.0-openjdk-headless || install_package java-1.8.0-openjdk-headless
95 92 
         yum_install ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.noarch.rpm
96 93 
         sudo /bin/systemctl daemon-reload
97 94 
         sudo /bin/systemctl enable elasticsearch.service