openstack/devstack
Code Issues Proposed changes

Merge "Fix elastic search support for Fedora."

Browse Source
This commit is contained in:
Jenkins 2016-01-06 20:04:34 +00:00 committed by Gerrit Code Review
commit 535fcd008e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/elasticsearch.sh
View File

@ -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