diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-09 18:12:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-09 18:12:02 +0000 |
| commit | a43e7792d4d39ae7ea5ab9588747ece66107ffe6 (patch) | |
| tree | 94eaa37632b56d0416339bf506c4db8c6499ba8f | |
| parent | dc15b8a3cf6870e44cad2989a210764239a6067e (diff) | |
| parent | e89536405fad5e47bb586450faec0499ad529d92 (diff) | |
| download | kolla-a43e7792d4d39ae7ea5ab9588747ece66107ffe6.tar.gz kolla-a43e7792d4d39ae7ea5ab9588747ece66107ffe6.zip | |
Merge "Fix influxdb container"
| -rw-r--r-- | docker/influxdb/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/influxdb/extend_start.sh | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/docker/influxdb/Dockerfile.j2 b/docker/influxdb/Dockerfile.j2 index fdd1cf614..b1195d55a 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 000000000..42a3c4607 --- /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 |