diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-26 16:35:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-26 16:35:15 +0000 |
| commit | 90bf4c564546f48219996942f814ca4cde8ce36c (patch) | |
| tree | a6fffca0f2fa89aed34783c148ac61d7f4465d59 | |
| parent | 71b3fde27559ceb378dd69f794a1176e853b9cd9 (diff) | |
| parent | 436749b660866b2a2db985f5491ff137d000bad6 (diff) | |
| download | kolla-90bf4c564546f48219996942f814ca4cde8ce36c.tar.gz kolla-90bf4c564546f48219996942f814ca4cde8ce36c.zip | |
Merge "Add oslo_service package to heat"
| -rwxr-xr-x[-rw-r--r--] | docker/centos/binary/heat/heat-base/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/centos/binary/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile index 510886164..4dc854d71 100644..100755 --- a/docker/centos/binary/heat/heat-base/Dockerfile +++ b/docker/centos/binary/heat/heat-base/Dockerfile @@ -1,8 +1,9 @@ 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 +RUN yum -y install python-oslo-policy && yum clean all && pip install oslo.service RUN mkdir -p /opt/kolla COPY config-heat.sh /opt/kolla/config-heat.sh |