summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-27 06:07:25 +0000
committerGerrit Code Review <review@openstack.org>2017-07-27 06:07:26 +0000
commit7f3b1b6c08326a533f96b4a54f2a86caa5655015 (patch)
treeea2c8e473f034bbbafe3996cb80211335963a1a6
parentb9063bac5c3934d42351a5da2b3b033d050e7ff8 (diff)
parent3e0e0c7b18f055a2d2b892cd4f648d4c3258c545 (diff)
Merge "Make collectd run as root inside the container"
-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 2989729c..3c0ba09b 100644
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -89,15 +89,17 @@ outputs:
collectd:
image: {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: