Fedora-21 has openjdk-1.8.0 only
Fedora-21 does not have openjdk-1.7.0 it has only 1.8.0.
This change also fixing the no op statement in the configure.
Change-Id: I6012aeb17b8e8fafa37d48aa29482702fa3491fd
diff --git a/pkg/elasticsearch.sh b/pkg/elasticsearch.sh
index 15e1b2b..447596a 100755
--- a/pkg/elasticsearch.sh
+++ b/pkg/elasticsearch.sh
@@ -44,7 +44,7 @@
function configure_elasticsearch {
# currently a no op
- ::
+ :
}
function start_elasticsearch {
@@ -78,7 +78,11 @@
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.7.0-openjdk-headless || install_package java-1.7.0-openjdk-headless
+ if [[ "$os_RELEASE" -ge "21" ]]; 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
yum_install ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.noarch.rpm
sudo /bin/systemctl daemon-reload
sudo /bin/systemctl enable elasticsearch.service