Skip to content

Commit 7ae7815

Browse files
committed
Remove setuptools pin
Change-Id: I7d08ebb65e2de82e3edba7bd9307b2b6ac8cb7a8
1 parent da7562c commit 7ae7815

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

docker/horizon/Dockerfile.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
4949
# NOTE(kevko): This dance with local settings python paths below is needed
5050
# because we are using different distros with different python version and we need to
5151
# know to which path symlink should point to.
52+
# NOTE(mnasiadka): pinning setuptools due to https://bugs.launchpad.net/horizon/+bug/2007574
5253
RUN ln -s horizon-source/* horizon \
54+
&& {{ macros.install_pip(['setuptools==67.2.*']) }} \
5355
&& {{ macros.upper_constraints_remove("horizon") }} \
5456
&& {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \
5557
&& mkdir -p /etc/openstack-dashboard \

docker/openstack-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ RUN ln -s openstack-base-source/* /requirements \
208208

209209
ENV PATH /var/lib/kolla/venv/bin:$PATH
210210

211-
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools==67.2.*']) }} \
211+
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \
212212
&& {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }}
213213

214214
{% if base_package_type == 'rpm' %}

0 commit comments

Comments
 (0)