diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-17 20:23:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-17 20:23:14 +0000 |
| commit | 02e5389da5fe960bda46fef19ed462aa4d306161 (patch) | |
| tree | 6afed287f5c9a3639eeab7c9d546aa0cbfe9efd0 | |
| parent | 617421fb380f8b26531c4c4ac78b65a3f5a135ec (diff) | |
| parent | a5a422f6355a0cbd5c48d16fb8c29d881c841c5b (diff) | |
| download | kolla-02e5389da5fe960bda46fef19ed462aa4d306161.tar.gz kolla-02e5389da5fe960bda46fef19ed462aa4d306161.zip | |
Merge "elasticsearch-curator: drop botocore workaround" into stable/train
| -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 |