From eff7deb94dfed2b471bc09d4fb415d804b60b493 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Mon, 29 Jun 2015 11:19:42 -0700 Subject: 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 --- docker/centos/binary/heat/heat-base/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docker/centos/binary/heat') 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 -- cgit v1.2.3