From ed85b4053259214f027a49a02d582464114ed72a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 10 Dec 2020 16:46:29 +0100 Subject: [PATCH] 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) --- docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 index 39a6aa7b97..8d0a09a965 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