From 5e15ee16deddfa84c765a6cbf72df0a63ef7c78d Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Tue, 10 Nov 2015 04:44:16 -0500
Subject: [PATCH] install openstack-heat-common in heat-base

the openstack-heat-common package installs the Heat UID/GID.
This is necessary pre-work for drop-root for heat services.

Change-Id: I247b0209248de144d20f5245973833be5cd8f14f
Partially-Implements: blueprint drop-root
---
 docker/heat/heat-base/Dockerfile.j2 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index 0bfa57afd7..c9ab54efc2 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -1,7 +1,15 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-{% if install_type == 'source' %}
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+RUN yum -y install \
+        openstack-heat-common \
+    && yum clean all
+
+    {% endif %}
+{% elif install_type == 'source' %}
 
 ADD heat-base-archive /heat-base-source
 RUN ln -s heat-base-source/* heat \