openstack
/
kolla
Code Issues Proposed changes

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 7db2f10019)
This commit is contained in:
Marcin Juszkiewicz 2020-12-10 16:46:29 +01:00 committed by Radosław Piliszek
parent 5f0a7e664b
commit ed85b40532
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
View File

@ -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