Merge "Remove setuptools pin"

Author: Zuul

docker/horizon/Dockerfile.j2

@@ -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 \

docker/openstack-base/Dockerfile.j2

@@ -211,7 +211,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' %}