openstack/kolla
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-11-04 13:49:50 +00:00 committed by Gerrit Code Review
commit 32e2121b4f
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker/kolla-toolbox/Dockerfile.j2
View File

@ -48,16 +48,19 @@ MAINTAINER {{ maintainer }}
{% endif %} {% endif %}
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} {{ 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 \ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \ && python get-pip.py \
&& rm get-pip.py \ && rm get-pip.py
&& pip --no-cache-dir install pytz \ {% endblock %}
&& pip --no-cache-dir install \
ansible==2.1.1.0 \ RUN pip --no-cache-dir install \
MySQL-python \ pytz \
os-client-config==1.16.0 \ ansible==2.1.1.0 \
pyudev \ MySQL-python \
shade==1.5.0 os-client-config==1.16.0 \
pyudev \
shade==1.5.0
RUN useradd -m --user-group ansible --groups kolla \ RUN useradd -m --user-group ansible --groups kolla \
&& mkdir -p /etc/ansible /usr/share/ansible \ && mkdir -p /etc/ansible /usr/share/ansible \

4
releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml Normal file
View File

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