summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Runge <mrunge@redhat.com>2017-07-12 14:20:27 +0200
committerMatthias Runge <mrunge@redhat.com>2017-07-19 08:47:17 +0200
commit3e0e0c7b18f055a2d2b892cd4f648d4c3258c545 (patch)
tree28eb45dc78832d5bfe20a386c83896132d87d10e
parentf2b68a1d13a1b7357182cdbc07872f84dcade3c9 (diff)
Make collectd run as root inside the container
that is the RPM package default anyways. Also add /var/log/collectd for logging to the container. Change-Id: I3e71c63c55f0fd71ad8e61547402d0eb94b455f6
-rw-r--r--docker/services/collectd.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index 0593e412..85018aa6 100644
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -96,15 +96,17 @@ outputs:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ]
net: host
+ pid: host
privileged: true
+ user: root
restart: always
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/run/docker.sock:/var/run/docker.sock:rw
- /var/lib/kolla/config_files/collectd.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/collectd/:/var/lib/kolla/config_files/src:ro
+ - /var/log/containers/collectd:/var/log/collectd:rw
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: