From 2e29f4b6f7c4b70cd1bcb8a46ee6718220112657 Mon Sep 17 00:00:00 2001 From: prithiv Date: Thu, 15 Sep 2016 11:01:54 +0100 Subject: [PATCH] Modify collectd permissions Modify permissions in collectd container to facilitate inclusion of plugins. Change-Id: If9ac860c7e533814d014834a18e0501d6512be61 Closes-Bug: #1620603 --- docker/collectd/Dockerfile.j2 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index 31722f69ed..532321f9a5 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -2,23 +2,26 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} {% block collectd_header %}{% endblock %} - {% import "macros.j2" as macros with context %} - -{% set collectd_packages = ['collectd'] %} +{% set collectd_packages = [ + 'collectd' +] %} {{ 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 --user-group collectd \ +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 + && usermod -a -G kolla collectd \ + && chown -R collectd /var/lib/collectd \ + && chown -R collectd /etc/collectd* \ + && chown -R collectd /var/run/ {% block collectd_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER collectd