From 93b5c12abf37692c8c15d62ba98d002fe2a774df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <elemoine@mirantis.com>
Date: Wed, 24 Feb 2016 11:57:55 +0100
Subject: [PATCH] Remove duplicate code in heat extend_start.sh

Change-Id: I8970d02ccbed1dfc221683e273edc2680207056b
Partial-Bug: #1546944
---
 docker/heat/heat-api/Dockerfile.j2    | 4 ++--
 docker/heat/heat-api/extend_start.sh  | 7 -------
 docker/heat/heat-base/Dockerfile.j2   | 3 ++-
 docker/heat/heat-base/extend_start.sh | 2 ++
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 358f44fdd6..a7e9ed89b8 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -16,8 +16,8 @@ RUN apt-get install -y --no-install-recommends \
     {% endif %}
 {% endif %}
 
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
+COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
+RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
 
 {{ include_footer }}
 
diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh
index 2eb7468f5a..ca4f83da58 100644
--- a/docker/heat/heat-api/extend_start.sh
+++ b/docker/heat/heat-api/extend_start.sh
@@ -1,12 +1,5 @@
 #!/bin/bash
 
-if [[ ! -d "/var/log/kolla/heat" ]]; then
-    mkdir -p /var/log/kolla/heat
-fi
-if [[ $(stat -c %a /var/log/kolla/heat) != "755" ]]; then
-    chmod 755 /var/log/kolla/heat
-fi
-
 # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
 # of the KOLLA_BOOTSTRAP variable being set, including empty.
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index bbdce7e908..e7507a66c2 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -30,4 +30,5 @@ RUN ln -s heat-base-source/* heat \
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN usermod -a -G kolla heat \
-    && chmod 755 /usr/local/bin/kolla_extend_start
+    && touch /usr/local/bin/kolla_heat_extend_start \
+    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start
diff --git a/docker/heat/heat-base/extend_start.sh b/docker/heat/heat-base/extend_start.sh
index 9cdefa6ade..de43a519cf 100644
--- a/docker/heat/heat-base/extend_start.sh
+++ b/docker/heat/heat-base/extend_start.sh
@@ -6,3 +6,5 @@ fi
 if [[ $(stat -c %a /var/log/kolla/heat) != "755" ]]; then
     chmod 755 /var/log/kolla/heat
 fi
+
+source /usr/local/bin/kolla_heat_extend_start