openstack/kolla
Code Issues Proposed changes

Remove setuptools pin

Browse Source 
Change-Id: I7d08ebb65e2de82e3edba7bd9307b2b6ac8cb7a8
This commit is contained in:
Michal Nasiadka
2023-11-24 12:35:54 +00:00
parent da7562c73f
commit 7ae7815613
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/horizon/Dockerfile.j2
View File

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

2
docker/openstack-base/Dockerfile.j2
View File

@@ -208,7 +208,7 @@ RUN ln -s openstack-base-source/* /requirements \
ENV PATH /var/lib/kolla/venv/bin:$PATH
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools==67.2.*']) }} \
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \
&& {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }}
{% if base_package_type == 'rpm' %}