openstack/kolla-ansible
Code Issues Proposed changes

Merge "Revert "Fix pycparser wheel package issue""

Browse Source
This commit is contained in:
Jenkins 2016-10-04 04:06:14 +00:00 committed by Gerrit Code Review
commit 366bef430b
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,13 +48,11 @@ MAINTAINER {{ maintainer }}
{% endif %}
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
# TODO(Jeffrey4l): remove `--no-binary pycparser` when the bug[0] is fixed.
# [0] https://github.com/eliben/pycparser/issues/147
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 --no-binary pycparser \
&& pip --no-cache-dir install \
ansible==2.1.1.0 \
MySQL-python \
os-client-config==1.16.0 \

6
docker/macros.j2
View File

@ -15,9 +15,5 @@
{% macro install_pip(packages) %}
{#-
TODO(Jeffrey4l): remove `--no-binary pycparser` when the bug[0] is fixed.
[0] https://github.com/eliben/pycparser/issues/147
-#}
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade --no-binary pycparser -c requirements/upper-constraints.txt {% for package in packages %}{{ package }} {% endfor %}
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt {% for package in packages %}{{ package }} {% endfor %}
{% endmacro %}