From d459d80b9ef26a13d2be6e761c8a16cd2e02c998 Mon Sep 17 00:00:00 2001
From: zhubingbing <zhu.bingbing@99cloud.net>
Date: Tue, 10 Jan 2017 05:57:51 +0000
Subject: [PATCH] Fix kuryr container

Add log directory,add missing chmod 755 /usr/local/bin/kolla_extend_start

Closes-Bug: #1655250
Change-Id: Iaebd5935063a4420d093abd6815d20e704be170b
---
 docker/kuryr/kuryr-base/Dockerfile.j2   | 1 +
 docker/kuryr/kuryr-base/extend_start.sh | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2
index 1269bced86..ece66c7d9d 100644
--- a/docker/kuryr/kuryr-base/Dockerfile.j2
+++ b/docker/kuryr/kuryr-base/Dockerfile.j2
@@ -20,5 +20,6 @@ RUN ln -s kuryr-base-source/* kuryr-base \
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block kuryr_base_footer %}{% endblock %}
diff --git a/docker/kuryr/kuryr-base/extend_start.sh b/docker/kuryr/kuryr-base/extend_start.sh
index ee7045d04d..214675bea0 100644
--- a/docker/kuryr/kuryr-base/extend_start.sh
+++ b/docker/kuryr/kuryr-base/extend_start.sh
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+KURYR_LOG_DIR=/var/log/kolla/kuryr
+
+if [[ ! -d "${KURYR_LOG_DIR}" ]]; then
+    mkdir -p ${KURYR_LOG_DIR}
+fi
+if [[ $(stat -c %a ${KURYR_LOG_DIR}) != "755" ]]; then
+    chmod 755 ${KURYR_LOG_DIR}
+fi
+
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     mkdir -p /usr/lib/docker/plugins/kuryr
     exit 0