diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-09-02 15:18:05 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-09-03 07:01:25 +0000 |
| commit | 326823c4d3661ee5cc329857eab65148aa1d8fba (patch) | |
| tree | f0fbaa2877965fe853579309654dff03a754aee7 /docker | |
| parent | 65d9a041723d60ccea4f1ffa39134beb4938ea9d (diff) | |
| download | kolla-326823c4d3661ee5cc329857eab65148aa1d8fba.tar.gz kolla-326823c4d3661ee5cc329857eab65148aa1d8fba.zip | |
Revert "openstack-base: pin setuptools < 46 to get horizon working"
This reverts commit ca8b61516401d61d90e2940fa130c8f55a8b6e45.
This is to fix recent breakage caused by setuptools and virtualenv
incompatibilities.
Includes bifrost version bump to fix its building.
Change-Id: Ia6c415b18374cefa3f160229d1f58cb209df348e
Closes-Bug: #1893920
Depends-On: https://review.opendev.org/749576
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 85e3c1826..30427bbe1 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -414,11 +414,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 %} |