openstack
/
kolla
Code Issues Proposed changes

elasticsearch: install Java first on CentOS too 

elasticsearch-oss package fails to install if we install it with Java:

INFO:kolla.common.utils.elasticsearch:could not find java; set JAVA_HOME
INFO:kolla.common.utils.elasticsearch:error: %prein(elasticsearch-oss-0:6.8.23-1.noarch) scriptlet failed, exit status 1
INFO:kolla.common.utils.elasticsearch:Error in PREIN scriptlet in rpm package elasticsearch-oss

Backport down to ussuri needed.

Change-Id: I72d7920acd8d15941c8c57a4186186212b273a38
This commit is contained in:
Marcin Juszkiewicz 2022-04-04 13:35:01 +02:00
parent a8fcb02f40
commit 976465c448
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/elasticsearch/elasticsearch/Dockerfile.j2
View File

@ -12,8 +12,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['elasticsearch']) }}
{% if base_package_type == 'rpm' %}
# NOTE(hrw): post-install script of elasticsearch fails when trying to
# install elasticsearch and java together.
{{ macros.install_packages(['java-11-openjdk-headless']) }}
{% set elasticsearch_packages = [
'java-11-openjdk-headless',
'elasticsearch-oss',
] %}