diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-10 16:46:29 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-11 13:00:14 +0000 |
| commit | 7db2f100195c7aecde449e47d758c784850bd456 (patch) | |
| tree | d82a5c862b0032946e90346cb86a76dd4ddb6e50 | |
| parent | 865f55d4ec408f1e0a5fd8ef4f77edc566c8eb75 (diff) | |
| download | kolla-7db2f100195c7aecde449e47d758c784850bd456.tar.gz kolla-7db2f100195c7aecde449e47d758c784850bd456.zip | |
elasticsearch-curator: drop botocore workaround
Curator got requirements sorted out upstream and builds fine now without
hack.
This reverts curator part of https://review.opendev.org/c/openstack/kolla/+/755339/
Change-Id: Iabe5b9684a7bf0e39a7dca824e6705b5069560bf
| -rw-r--r-- | docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 index b25222c44..f2024b242 100644 --- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 @@ -30,9 +30,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'elasticsearch-curator' ] %} -{# 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) }} \ +RUN {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \ && mkdir -p /etc/elasticsearch-curator \ && chown -R elasticsearch: /etc/elasticsearch-curator |