aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/kolla-toolbox/Dockerfile.j219
-rw-r--r--releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml4
2 files changed, 15 insertions, 8 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index a74024f8e..5b5dab888 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -48,16 +48,19 @@ 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 \
- ansible==2.1.1.0 \
- MySQL-python \
- os-client-config==1.16.0 \
- pyudev \
- shade==1.5.0
+ && 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 \
+ pyudev \
+ shade==1.5.0
RUN useradd -m --user-group ansible --groups kolla \
&& mkdir -p /etc/ansible /usr/share/ansible \
diff --git a/releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml b/releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml
new file mode 100644
index 000000000..f6b0dad48
--- /dev/null
+++ b/releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml
@@ -0,0 +1,4 @@
+---
+features:
+ - Allow operators to customise the installation of pip
+ within kolla-toolbox.