openstack/kolla-ansible
Code Issues Proposed changes

Install oslo.service via pip

Browse Source 
python-oslo-service is not yet packaged for Delorean, causing
multiple services that have switched to this library to break.
To resolve that problem, we have a short term fix of installing
the oslo.service via pip in the base image.

Change-Id: Iff3410ec90b25b239ee49cc725ef224fa80e7aee
Closes-Bug: #1469821
This commit is contained in:
Steven Dake 2015-06-29 11:19:42 -07:00
parent 73a6ba90c4
commit eff7deb94d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/centos/binary/base/Dockerfile
View File

@ -101,7 +101,10 @@ RUN yum install -y \
python-webtest \
python-werkzeug \
python-wsme \
&& yum clean all
&& yum clean all \
&& pip install oslo.service
# TODO(inc0): when oslo_service lands in delorean, change pip to yum
# necessary until https://bugzilla.redhat.com/show_bug.cgi?id=1229477 is fixed
# This is dirty like zebra. This works around a bug in Ubuntu 14.04 LTS. The
# --net=host option does not work on ubuntu 14.04 because of a kernel bug. One

4
docker/centos/binary/heat/heat-base/Dockerfile
View File

@ -1,9 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# TODO(inc0): when oslo_service lands in delorean, change pip to yum
# necessary until https://bugzilla.redhat.com/show_bug.cgi?id=1229477 is fixed
RUN yum -y install python-oslo-policy && yum clean all && pip install oslo.service
RUN yum -y install python-oslo-policy && yum clean all
RUN mkdir -p /opt/kolla
COPY config-heat.sh /opt/kolla/config-heat.sh