diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-10 16:46:29 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-12-15 12:03:10 +0000 |
| commit | a5a422f6355a0cbd5c48d16fb8c29d881c841c5b (patch) | |
| tree | 4779b201a13bec707e5cb5960e9fc2804104e4ec /docker | |
| parent | 13e73e983b849cfd9de0e3df67180389f470b603 (diff) | |
| download | kolla-a5a422f6355a0cbd5c48d16fb8c29d881c841c5b.tar.gz kolla-a5a422f6355a0cbd5c48d16fb8c29d881c841c5b.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
(cherry picked from commit 7db2f100195c7aecde449e47d758c784850bd456)
Diffstat (limited to 'docker')
| -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 e22da7832..c6a630a88 100644 --- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 @@ -27,9 +27,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, pip_version="pip3") }} \ - && {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }} \ +RUN {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }} \ && mkdir -p /etc/elasticsearch-curator \ && chown -R elasticsearch: /etc/elasticsearch-curator |