From e89536405fad5e47bb586450faec0499ad529d92 Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Mon, 9 Jan 2017 07:12:24 +0000 Subject: [PATCH] Fix influxdb container Add influxdb log directory Closes-Bug: #1655001 Change-Id: I9661fe8e8138adf7f1f50f2f2864ee4683f956d9 --- docker/influxdb/Dockerfile.j2 | 3 +++ docker/influxdb/extend_start.sh | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 docker/influxdb/extend_start.sh diff --git a/docker/influxdb/Dockerfile.j2 b/docker/influxdb/Dockerfile.j2 index fdd1cf614e..b1195d55ab 100644 --- a/docker/influxdb/Dockerfile.j2 +++ b/docker/influxdb/Dockerfile.j2 @@ -9,8 +9,11 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(influxdb_packages | customizable("packages")) }} COPY influxdb_sudoers /etc/sudoers.d/kolla_influxdb_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_influxdb_sudoers \ + && chmod 755 /usr/local/bin/kolla_extend_start \ && usermod -a -G kolla influxdb {% block influxdb_footer %}{% endblock %} diff --git a/docker/influxdb/extend_start.sh b/docker/influxdb/extend_start.sh new file mode 100644 index 0000000000..42a3c4607b --- /dev/null +++ b/docker/influxdb/extend_start.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# Create log directory, with appropriate permissions +INFLUXDB_LOG_DIR=/var/log/kolla/influxdb + +if [[ ! -d "${INFLUXDB_LOG_DIR}" ]]; then + mkdir -p ${INFLUXDB_LOG_DIR} +fi +if [[ $(stat -c %a ${INFLUXDB_LOG_DIR}) != "755" ]]; then + chmod 755 ${INFLUXDB_LOG_DIR} +fi