openstack
/
kolla
Code Issues Proposed changes

Merge "Fix oslo.log pinning" into stable/liberty

This commit is contained in:
Jenkins 2015-10-21 16:04:23 +00:00 committed by Gerrit Code Review
parent 5a64e62c22 82c80b7adf
commit 1a1958f209
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/openstack-base/Dockerfile.j2
View File

@ -74,7 +74,12 @@ RUN apt-get install -y --no-install-recommends \
{% endif %}
ADD openstack-base-archive /openstack-base-source
# TODO(SamYaple): Remove the sed once openstack/requirements is updated. This
# is to work around the issue with oslo.log and syslog.
# Related-Bug: #1499620
RUN ln -s openstack-base-source/* /requirements \
&& sed -i 's/oslo.log===1.11.0/oslo.log===1.12.1/' requirements/upper-constraints.txt \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \
&& rm get-pip.py \