Merge "Upgrade pip and friends in source images"

Author: Zuul

docker/kolla-toolbox/Dockerfile.j2

@@ -94,7 +94,8 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH
     ] %}
 
 COPY requirements.yml /var/lib/ansible/
-RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \
+RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \
+    && {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \
     && mkdir -p /etc/ansible /usr/share/ansible \
     && echo 'localhost ansible_connection=local ansible_python_interpreter={{ virtualenv_path }}/bin/python' > /etc/ansible/hosts \
     && sed -i 's|  "identity_api_version": "2.0",|  "identity_api_version": "3",|' {{ os_client_config }} \

docker/openstack-base/Dockerfile.j2

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

releasenotes/notes/upgrade-pip-44352805d60bbf7f.yaml

@@ -0,0 +1,6 @@
+---
+other:
+  - |
+    ``kolla-toolbox`` and all images derived from ``openstack-base`` one have
+    basic Python packages (``pip``, ``wheel``, ``setuptools``) upgraded to latest
+    versions.