openstack/kolla
Code Issues Proposed changes

Merge "Modify collectd permissions"

Browse Source
This commit is contained in:
Jenkins 2016-09-16 12:50:23 +00:00 committed by Gerrit Code Review
commit f9956f2e10
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/collectd/Dockerfile.j2
View File

@ -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