Merge "Add DeployedServerEnvironmentOutput"

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

diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml
index a8ae857..e346182 100644 (file)
--- a/docker/services/gnocchi-statsd.yaml
+++ b/docker/services/gnocchi-statsd.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-gnocchi-statsd:latest'
     type: string
+  DockerGnocchiConfigImage:
+    description: The container image to use for the gnocchi config_volume
+    default: 'centos-binary-gnocchi-api:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -63,13 +67,18 @@ outputs:
         config_volume: gnocchi
         puppet_tags: gnocchi_config
         step_config: *step_config
-        config_image: &gnocchi_statsd_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiStatsdImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/gnocchi_statsd.json:
           command: /usr/bin/gnocchi-statsd
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/gnocchi
               owner: gnocchi:gnocchi
@@ -77,7 +86,10 @@ outputs:
       docker_config:
         step_4:
           gnocchi_statsd:
-            image: *gnocchi_statsd_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerGnocchiStatsdImage} ]
             net: host
             privileged: false
             restart: always
@@ -86,7 +98,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/gnocchi_statsd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+                  - /var/lib/config-data/puppet-generated/gnocchi/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/gnocchi:/var/log/gnocchi
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS