diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-04 13:35:01 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-04 13:37:32 +0200 |
| commit | 976465c448c4de2bd323021b946770b26ab1e912 (patch) | |
| tree | aea4f8f3e130689df09e8010f8f987d2e77d2884 /docker | |
| parent | a8fcb02f40c94c2101edff9ec4a3101d1d14fe97 (diff) | |
| download | kolla-976465c448c4de2bd323021b946770b26ab1e912.tar.gz kolla-976465c448c4de2bd323021b946770b26ab1e912.zip | |
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:[91mError in PREIN scriptlet in rpm package elasticsearch-oss
Backport down to ussuri needed.
Change-Id: I72d7920acd8d15941c8c57a4186186212b273a38
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/elasticsearch/elasticsearch/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/elasticsearch/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/elasticsearch/Dockerfile.j2 index d09a0d817..5633ce6d3 100644 --- a/docker/elasticsearch/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch/Dockerfile.j2 @@ -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', ] %} |