diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-30 07:15:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-30 07:15:47 +0000 |
| commit | a409b1a03db67b5587214759963687e7c0a6258e (patch) | |
| tree | eaac6cb6c52a85cb42d3543a8fce6739c79572ba | |
| parent | e2a55c3a027f354b5a29b1439030e7299c308927 (diff) | |
| parent | c59b2cca0a21c515a5ec1d527be66d0970421116 (diff) | |
| download | kolla-a409b1a03db67b5587214759963687e7c0a6258e.tar.gz kolla-a409b1a03db67b5587214759963687e7c0a6258e.zip | |
Merge "Dockerfiles for collectd Container"
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 22 | ||||
| -rw-r--r-- | docker/collectd/collectd_sudoers | 1 | ||||
| -rw-r--r-- | docker/collectd/extend_start.sh | 6 |
3 files changed, 29 insertions, 0 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 new file mode 100644 index 000000000..c04b367b9 --- /dev/null +++ b/docker/collectd/Dockerfile.j2 @@ -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 diff --git a/docker/collectd/collectd_sudoers b/docker/collectd/collectd_sudoers new file mode 100644 index 000000000..fae410a99 --- /dev/null +++ b/docker/collectd/collectd_sudoers @@ -0,0 +1 @@ +%kolla ALL=(root) NOPASSWD: /bin/chown collectd\: /var/lib/collectd/, /usr/bin/chown collectd\: /var/lib/collectd/ diff --git a/docker/collectd/extend_start.sh b/docker/collectd/extend_start.sh new file mode 100644 index 000000000..5142a67fe --- /dev/null +++ b/docker/collectd/extend_start.sh @@ -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
\ No newline at end of file |