diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-03 13:53:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-03 13:53:15 +0000 |
| commit | 92f5bae458c9291a68f17aa3fecfeae6372368e0 (patch) | |
| tree | a2613b036f23f3c2e0f117ded70f982aead5487f /docker | |
| parent | 3da0aaa845053aa667bf57c3b9fdfc4e363259da (diff) | |
| parent | 5969a1ca416605df16d0946fff13dcb9743e693e (diff) | |
| download | kolla-92f5bae458c9291a68f17aa3fecfeae6372368e0.tar.gz kolla-92f5bae458c9291a68f17aa3fecfeae6372368e0.zip | |
Merge "Revert "openstack-base: pin setuptools < 46 to get horizon working""
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 741f31cc9..068b1ae2b 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -416,11 +416,6 @@ RUN ln -s openstack-base-source/* /requirements \ ENV PATH /var/lib/kolla/venv/bin:$PATH -# FIXME(hrw): pyScss used by Horizon fails to work with setuptools >= 46 -# it had last release in 2016 so probably no one will fix it. -# So we need to be sure that we get older version of setuptools. -RUN {{ macros.install_pip(['"setuptools<46"']) }} - RUN {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} {% endif %} |