From 82c80b7adf1f05f5c2dda352b39722c8591bf1c5 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 21 Oct 2015 13:33:06 +0000
Subject: [PATCH] Fix oslo.log pinning

This sed rule won't adjust anything once oslo.log is fixed upstream.
But for this particular version it will fix things.

Change-Id: Id9e85ac8466c04e2c62231531d419c0838ec89e3
Related-Bug: #1499620
---
 docker/openstack-base/Dockerfile.j2 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 62d09941f3..cf3fe3bcea 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -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 \