1. devstack
  2. Commit 535fcd008eee7ec5d11f8d788f7d48514db56bfb
Browse code

Merge "Fix elastic search support for Fedora."

Jenkins authored on 2016/01/07 05:04:34
Showing 1 changed files
pkg/elasticsearch.sh
History View file @ 535fcd0
... ... 
@@ -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