From 473a0229d4cb3ee9865ac864df29f8d27edf1937 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Mon, 28 Sep 2015 03:10:47 -0700
Subject: [PATCH] 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
---
docker/heat/heat-base/Dockerfile.j2 | 9 +--------
1 file changed, 1 insertion(+), 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 \
--
GitLab