diff options
| author | Steven Dake <stdake@cisco.com> | 2015-06-29 11:19:42 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-06-29 11:21:42 -0700 |
| commit | eff7deb94dfed2b471bc09d4fb415d804b60b493 (patch) | |
| tree | 21c6bb2b006946a576b865ac1b3b98f943b9df14 /docker/centos | |
| parent | 73a6ba90c416ac1e531ab534eb9d30af5307b5de (diff) | |
| download | kolla-eff7deb94dfed2b471bc09d4fb415d804b60b493.tar.gz kolla-eff7deb94dfed2b471bc09d4fb415d804b60b493.zip | |
Install oslo.service via pip
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
Diffstat (limited to 'docker/centos')
| -rw-r--r-- | docker/centos/binary/base/Dockerfile | 5 | ||||
| -rwxr-xr-x | docker/centos/binary/heat/heat-base/Dockerfile | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docker/centos/binary/base/Dockerfile b/docker/centos/binary/base/Dockerfile index c929d7a55..60f56aee3 100644 --- a/docker/centos/binary/base/Dockerfile +++ b/docker/centos/binary/base/Dockerfile @@ -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 diff --git a/docker/centos/binary/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile index 4dc854d71..7321ca8a6 100755 --- a/docker/centos/binary/heat/heat-base/Dockerfile +++ b/docker/centos/binary/heat/heat-base/Dockerfile @@ -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 |