diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-16 12:50:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-16 12:50:23 +0000 |
| commit | f9956f2e103d8e95720b8312e6fdca18182d69a3 (patch) | |
| tree | 7c8a2f93c38df32ed962798727ac1a9b13d0bf07 /docker | |
| parent | 112974b0527aff215d95813f777b554bd95807c7 (diff) | |
| parent | 2e29f4b6f7c4b70cd1bcb8a46ee6718220112657 (diff) | |
| download | kolla-f9956f2e103d8e95720b8312e6fdca18182d69a3.tar.gz kolla-f9956f2e103d8e95720b8312e6fdca18182d69a3.zip | |
Merge "Modify collectd permissions"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index 31722f69e..532321f9a 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 |