diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-08 09:32:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-08 09:32:43 +0000 |
| commit | 1d0e32da9df4be318ef6e7baf0285e5bdb062eaf (patch) | |
| tree | e6c44661e3baa5fd9f2f67213f69ac89069e8083 | |
| parent | 01250d938e0f858b3325089321439b6eeefae9b8 (diff) | |
| parent | 9ed49df4b40486514ae4e0b6ad0b1f4c1d5f8aea (diff) | |
| download | kolla-1d0e32da9df4be318ef6e7baf0285e5bdb062eaf.tar.gz kolla-1d0e32da9df4be318ef6e7baf0285e5bdb062eaf.zip | |
Merge "fix collectd dockerfile"
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/collectd/collectd_sudoers | 1 | ||||
| -rw-r--r-- | docker/collectd/extend_start.sh | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index 532321f9a..ded2fa271 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -8,13 +8,10 @@ MAINTAINER {{ maintainer }} ] %} {{ macros.install_packages(collectd_packages | customizable("packages")) }} -COPY collectd_sudoers /etc/sudoers.d/kolla_collectd_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN useradd -r -m collectd \ && chmod 755 /usr/local/bin/kolla_extend_start \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_collectd_sudoers \ && usermod -a -G kolla collectd \ && chown -R collectd /var/lib/collectd \ && chown -R collectd /etc/collectd* \ diff --git a/docker/collectd/collectd_sudoers b/docker/collectd/collectd_sudoers deleted file mode 100644 index fae410a99..000000000 --- a/docker/collectd/collectd_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /bin/chown collectd\: /var/lib/collectd/, /usr/bin/chown collectd\: /var/lib/collectd/ diff --git a/docker/collectd/extend_start.sh b/docker/collectd/extend_start.sh index 92ff4a5ea..80ef63db3 100644 --- a/docker/collectd/extend_start.sh +++ b/docker/collectd/extend_start.sh @@ -1,6 +1,8 @@ #!/bin/bash -# Only update permissions if permissions need to be updated -if [[ $(stat -c %U:%G /var/lib/collectd) != "collectd:collectd" ]]; then - sudo chown collectd: /var/lib/collectd +if [[ ! -d "/var/log/kolla/collectd" ]]; then + mkdir -p /var/log/kolla/collectd +fi +if [[ $(stat -c %a /var/log/kolla/collectd) != "755" ]]; then + chmod 755 /var/log/kolla/collectd fi |