Merge "Remove ceilometer apache files on upgrade"

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

diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml
index 0930f42..9e89385 100644 (file)
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-aodh-listener:latest'
     type: string
+  DockerAodhConfigImage:
+    description: The container image to use for the aodh config_volume
+    default: 'centos-binary-aodh-api:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -65,13 +69,18 @@ outputs:
         config_volume: aodh
         puppet_tags: aodh_config
         step_config: *step_config
-        config_image: &aodh_listener_image
+        config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerAodhListenerImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerAodhConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/aodh_listener.json:
           command: /usr/bin/aodh-listener
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/aodh
               owner: aodh:aodh
@@ -79,7 +88,10 @@ outputs:
       docker_config:
         step_4:
           aodh_listener:
-            image: *aodh_listener_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerAodhListenerImage} ]
             net: host
             privileged: false
             restart: always
@@ -88,7 +100,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/aodh_listener.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+                  - /var/lib/config-data/puppet-generated/aodh/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/aodh:/var/log/aodh
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS