From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 27 Jul 2017 06:07:25 +0000 (+0000)
Subject: Merge "Make collectd run as root inside the container"
X-Git-Tag: opnfv-6.0.0~330
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7f3b1b6c08326a533f96b4a54f2a86caa5655015;p=apex-tripleo-heat-templates.git

Merge "Make collectd run as root inside the container"
---

7f3b1b6c08326a533f96b4a54f2a86caa5655015
diff --cc docker/services/collectd.yaml
index 2989729c,85018aa6..3c0ba09b
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@@ -87,9 -91,14 +87,11 @@@ outputs
        docker_config:
          step_3:
            collectd:
 -            image:
 -              list_join:
 -                - '/'
 -                - [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ]
 +            image: {get_param: DockerCollectdImage}
              net: host
+             pid: host
              privileged: true
+             user: root
              restart: always
              volumes:
                list_concat: