Merge "Allow operators to customise pip in kolla-toolbox"

docker/kolla-toolbox/Dockerfile.j2

@@ -48,11 +48,14 @@ MAINTAINER {{ maintainer }}
 {% endif %}
 {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
 
+{% block kolla_toolbox_source_install_python_pip %}
 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && python get-pip.py \
-    && rm get-pip.py \
-    && pip --no-cache-dir install pytz \
-    && pip --no-cache-dir install \
+    && rm get-pip.py
+{% endblock %}
+
+RUN pip --no-cache-dir install \
+    pytz \
     ansible==2.1.1.0 \
     MySQL-python \
     os-client-config==1.16.0 \

releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Allow operators to customise the installation of pip
+    within kolla-toolbox.