diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-13 07:40:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-13 07:40:45 +0000 |
| commit | a9c98ba58c9ca781685a4c42ebaafab90002659b (patch) | |
| tree | d841486fef9181ecbc1929233bf74a5f8a41f936 | |
| parent | ea747d7ce26bf22f2d079bc85aa64972befb0002 (diff) | |
| parent | 388eee2eabf4c20d8f5aa477d99e4f6c77d61fc8 (diff) | |
| download | kolla-a9c98ba58c9ca781685a4c42ebaafab90002659b.tar.gz kolla-a9c98ba58c9ca781685a4c42ebaafab90002659b.zip | |
Merge "add telegraf log directory /var/log/kolla/telegraf"
| -rw-r--r-- | docker/telegraf/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/telegraf/extend_start.sh | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index 2e2811b7d..81906ced7 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -6,8 +6,11 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(telegraf_packages | customizable("packages")) }} COPY telegraf_sudoers /etc/sudoers.d/kolla_telegraf_sudoers +COPY extend_start.sh /usr/local/bin/kolla_telegraf_extend_start + RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_telegraf_sudoers \ + && chmod 755 /usr/local/bin/kolla_telegraf_extend_start \ && usermod -a -G kolla telegraf {% block telegraf_footer %}{% endblock %} diff --git a/docker/telegraf/extend_start.sh b/docker/telegraf/extend_start.sh new file mode 100644 index 000000000..2830da1cb --- /dev/null +++ b/docker/telegraf/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +TELEGRAF_LOG_DIR="/var/log/kolla/telegraf" + +if [[ ! -d "${TELEGRAF_LOG_DIR}" ]]; then + mkdir -p ${TELEGRAF_LOG_DIR} +fi +if [[ $(stat -c %a ${TELEGRAF_LOG_DIR}) != "755" ]]; then + chmod 755 ${TELEGRAF_LOG_DIR} +fi |