aboutsummaryrefslogtreecommitdiff
path: root/docker/openstack-base/Dockerfile.j2
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-03-26 10:58:13 +0000
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-03-30 15:44:49 +0000
commit5969a1ca416605df16d0946fff13dcb9743e693e (patch)
tree9a7cd36be8efec5eeb8937fe7c862bb1d1aac6ae /docker/openstack-base/Dockerfile.j2
parent69f74554671a49c75bebeeed9d83816ffbd7efec (diff)
downloadkolla-5969a1ca416605df16d0946fff13dcb9743e693e.tar.gz
kolla-5969a1ca416605df16d0946fff13dcb9743e693e.zip
Revert "openstack-base: pin setuptools < 46 to get horizon working"
pyScss 1.3.6 release has required fixes and horizon is using it. This reverts commit 5498671b344e48d6db865887537ff15cf4028510. Change-Id: I27bf14a8ff81086174eb0d55501039d4678b015e
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
-rw-r--r--docker/openstack-base/Dockerfile.j25
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 %}