diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-14 12:32:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-14 12:32:08 +0000 |
| commit | 30e1c569bb83e8990284a2f0f38094963dbad2f5 (patch) | |
| tree | 93114726ec5e6f13204e9f63b2c3c7a8163757c4 | |
| parent | 75f76692b2474b97903187d92e9e7ac39515e8cf (diff) | |
| parent | 7db2f100195c7aecde449e47d758c784850bd456 (diff) | |
| download | kolla-30e1c569bb83e8990284a2f0f38094963dbad2f5.tar.gz kolla-30e1c569bb83e8990284a2f0f38094963dbad2f5.zip | |
Merge "elasticsearch-curator: drop botocore workaround"
| -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 |