From 82264ab7d6d178b6d69c84016997cd4df34f112a Mon Sep 17 00:00:00 2001
From: Éric Lemoine <elemoine@mirantis.com>
Date: Wed, 17 Feb 2016 14:26:19 +0100
Subject: Make Heka collect Heat logs

Partially implements: blueprint heka
Change-Id: Ie22c4326c6ec2a3426b0c3b8fda4554b1b2541b0
---
 docker/heat/heat-api/extend_start.sh  | 7 +++++++
 docker/heat/heat-base/Dockerfile.j2   | 9 ++++++---
 docker/heat/heat-base/extend_start.sh | 8 ++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 docker/heat/heat-base/extend_start.sh

(limited to 'docker')

diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh
index ca4f83da5..2eb7468f5 100644
--- a/docker/heat/heat-api/extend_start.sh
+++ b/docker/heat/heat-api/extend_start.sh
@@ -1,5 +1,12 @@
 #!/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 ca818b94b..bbdce7e90 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -21,10 +21,13 @@ ADD heat-base-archive /heat-base-source
 RUN ln -s heat-base-source/* heat \
     && useradd --user-group heat \
     && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /heat \
-    && mkdir -p /etc/heat /var/log/heat /home/heat \
+    && mkdir -p /etc/heat /home/heat \
     && cp -r /heat/etc/heat/* /etc/heat/ \
-    && chown -R heat: /etc/heat /var/log/heat /home/heat
+    && chown -R heat: /etc/heat /home/heat
 
 {% endif %}
 
-RUN usermod -a -G kolla 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
diff --git a/docker/heat/heat-base/extend_start.sh b/docker/heat/heat-base/extend_start.sh
new file mode 100644
index 000000000..9cdefa6ad
--- /dev/null
+++ b/docker/heat/heat-base/extend_start.sh
@@ -0,0 +1,8 @@
+#!/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
-- 
cgit v1.2.3