diff options
| author | Steven Dake <stdake@cisco.com> | 2015-09-28 03:10:47 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-09-28 03:16:52 -0700 |
| commit | 473a0229d4cb3ee9865ac864df29f8d27edf1937 (patch) | |
| tree | 464c8cfd4196ebe49aad15eb2144ea14bb846160 | |
| parent | f74cd0ecb89e6f38e01ed1c742489ffef25e8ff6 (diff) | |
| download | kolla-473a0229d4cb3ee9865ac864df29f8d27edf1937.tar.gz kolla-473a0229d4cb3ee9865ac864df29f8d27edf1937.zip | |
Heat doesn't need to specify python-oslo-reports
This package is correctly specified in the dependencies of the
heat packaging now so removing it from the base package.
Change-Id: I9028f41f5ee95b728c425235846b9825501b6f70
Implements: blueprint rhel-based-image-support
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 00ca07f3b..e4acffcf1 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -1,14 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install python-oslo-reports \ - && yum clean all - - {% endif %} -{% elif install_type == 'source' %} +{% if install_type == 'source' %} ADD heat-base-archive /heat-base-source RUN ln -s heat-base-source/* heat \ |