diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-04 04:06:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-04 04:06:14 +0000 |
| commit | 366bef430b742b68ca4cbbccdf120771ed60e1b5 (patch) | |
| tree | bb0db2b3636669e13b022431c7a8f9ec5e076688 | |
| parent | cac300e0c85ae2a6878e8a7b388da41b7584d282 (diff) | |
| parent | 190144926d11e43bcea00645622b726c4001778c (diff) | |
| download | kolla-366bef430b742b68ca4cbbccdf120771ed60e1b5.tar.gz kolla-366bef430b742b68ca4cbbccdf120771ed60e1b5.zip | |
Merge "Revert "Fix pycparser wheel package issue""
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/macros.j2 | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 1793ba6f7..78b0a6cbd 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -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 \ diff --git a/docker/macros.j2 b/docker/macros.j2 index c19098e30..32496a921 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -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 %} |