Merge "fix collectd dockerfile"

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* \

docker/collectd/collectd_sudoers

-%kolla ALL=(root) NOPASSWD: /bin/chown collectd\: /var/lib/collectd/, /usr/bin/chown collectd\: /var/lib/collectd/

docker/collectd/extend_start.sh

 #!/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