Merge "Make Heka collect Mistral logs"

3 files changed, 19 insertions, 5 deletions

diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
index 3e313ddef..716ab07eb 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/docker/mistral/mistral-api/Dockerfile.j2
@@ -1,8 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
-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_mistral_extend_start
+RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start
 
 {{ include_footer }}
 
diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2
index fbcc7f3e8..6f37014f4 100644
--- a/docker/mistral/mistral-base/Dockerfile.j2
+++ b/docker/mistral/mistral-base/Dockerfile.j2
@@ -12,10 +12,14 @@ ADD mistral-base-archive /mistral-base-source
 RUN ln -s mistral-base-source/* mistral \
     && useradd --user-group mistral \
     && /var/lib/kolla/venv/bin/pip --no-cache-dir install /mistral \
-    && mkdir -p /etc/mistral /var/log/mistral /home/mistral \
+    && mkdir -p /etc/mistral /home/mistral \
     && cp -r /mistral/etc/* /etc/mistral/ \
-    && chown -R mistral: /etc/mistral /var/log/mistral /home/mistral
+    && chown -R mistral: /etc/mistral /home/mistral
 
 {% endif %}
 
-RUN usermod -a -G kolla mistral
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN usermod -a -G kolla mistral \
+    && touch /usr/local/bin/kolla_mistral_extend_start \
+    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_mistral_extend_start
diff --git a/docker/mistral/mistral-base/extend_start.sh b/docker/mistral/mistral-base/extend_start.sh
new file mode 100644
index 000000000..f84c570c4
--- /dev/null
+++ b/docker/mistral/mistral-base/extend_start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [[ ! -d "/var/log/kolla/mistral" ]]; then
+    mkdir -p /var/log/kolla/mistral
+fi
+if [[ $(stat -c %a /var/log/kolla/mistral) != "755" ]]; then
+    chmod 755 /var/log/kolla/mistral
+fi
+
+source /usr/local/bin/kolla_mistral_extend_start