Merge "Dockerfiles for collectd Container"

This commit is contained in:
Jenkins 2016-08-30 07:15:47 +00:00 committed by Gerrit Code Review
commit a409b1a03d
3 changed files with 29 additions and 0 deletions

View File

@ -0,0 +1,22 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% 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 \
&& 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
{% block collectd_footer %}{% endblock %}
{{ include_footer }}
USER collectd

View File

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

View File

@ -0,0 +1,6 @@
#!/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
fi