openstack/devstack
Code Issues Proposed changes

Merge "Use java version independent package on Ubuntu"

Browse Source
This commit is contained in:
Jenkins 2016-12-20 00:59:56 +00:00 committed by Gerrit Code Review
commit 894cbd6545
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/debs/general
View File

@ -2,6 +2,7 @@ bc
bridge-utils bridge-utils
bsdmainutils bsdmainutils
curl curl
default-jre-headless # NOPRIME
g++ g++
gcc gcc
gettext # used for compiling message catalogs gettext # used for compiling message catalogs
@ -17,7 +18,6 @@ libxml2-dev # lxml
libxslt1-dev # lxml libxslt1-dev # lxml
libyaml-dev libyaml-dev
lsof # useful when debugging lsof # useful when debugging
openjdk-7-jre-headless # NOPRIME
openssh-server openssh-server
openssl openssl
pkg-config pkg-config

2
pkg/elasticsearch.sh
View File

@ -83,7 +83,7 @@ function install_elasticsearch {
return return
fi fi
if is_ubuntu; then if is_ubuntu; then
is_package_installed openjdk-7-jre-headless || install_package openjdk-7-jre-headless is_package_installed default-jre-headless || install_package default-jre-headless
sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb
sudo update-rc.d elasticsearch defaults 95 10 sudo update-rc.d elasticsearch defaults 95 10