diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-10-01 10:56:40 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-10-23 11:06:18 +0200 |
| commit | 78351df2ccfa7d4ccc20a41fc51837b124e18358 (patch) | |
| tree | 9e6011867f084c565f89696cb2cb0224382b7dff /docker/elasticsearch | |
| parent | 83aaa9c40188c5badf50905bae3f84c19cc67121 (diff) | |
| download | kolla-78351df2ccfa7d4ccc20a41fc51837b124e18358.tar.gz kolla-78351df2ccfa7d4ccc20a41fc51837b124e18358.zip | |
Switch to Victoria stable branches
This includes switching to releases of independently released projects.
Projects missing stable branches:
* networking-ansible
* vmware-nsx
* vmware-nsxlib
Includes the following other change squashed to pass CI:
elasticsearch-curator: install boto before curator
We need to install older boto versions to get image built.
Change https://review.opendev.org/759233
Change-Id: I6983b01daa6e577e3238f2823e6e7693d0a73c0a
Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'docker/elasticsearch')
| -rw-r--r-- | docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 index 34fef466a..01e11c96e 100644 --- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 @@ -29,7 +29,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'elasticsearch-curator' ] %} -RUN {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \ +{# FIXME: Revert the boto installations once we figure this issue out #} +RUN {{ macros.install_pip(['"boto3<1.16"', '"botocore<1.19"'], constraints=false) }} \ + && {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \ && mkdir -p /etc/elasticsearch-curator \ && chown -R elasticsearch: /etc/elasticsearch-curator |