Merge "Make NeutronEnableDVR parameter consistent"

[apex-tripleo-heat-templates.git] / docker / services / collectd.yaml

diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index 6c58a58..0593e41 100644 (file)
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-collectd:latest'
     type: string
+  DockerCollectdConfigImage:
+    description: The container image to use for the collectd config_volume
+    default: 'centos-binary-collectd:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -68,13 +72,18 @@ outputs:
         config_volume: collectd
         puppet_tags:  collectd_client_config
         step_config: *step_config
-        config_image: &collectd_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerCollectdConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/collectd.json:
           command: /usr/sbin/collectd -f
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/collectd
               owner: collectd:collectd
@@ -82,7 +91,10 @@ outputs:
       docker_config:
         step_3:
           collectd:
-            image: *collectd_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerCollectdImage} ]
             net: host
             privileged: true
             restart: always
@@ -92,9 +104,7 @@ outputs:
                 -
                   - /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/collectd/etc/collectd.conf:/etc/collectd.conf:ro
-                  - /var/lib/config-data/collectd/etc/collectd.d:/etc/collectd.d:ro
-                  - /var/log/containers/collectd:/var/log/collectd:rw
+                  - /var/lib/config-data/puppet-generated/collectd/:/var/lib/kolla/config_files/src:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks: