Merge "Enables support for configuring Cinder with Pure Storage FlashArray storage...

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

diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml
index abb44de..13d6cf2 100644 (file)
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   AodhEvaluatorBase:
     type: ../../puppet/services/aodh-evaluator.yaml
     properties:
@@ -57,13 +60,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerAodhEvaluatorImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/aodh-evaluator.json:
-           command: /usr/bin/aodh-evaluator
-           config_files:
-           - dest: /etc/aodh/aodh.conf
-             owner: aodh
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/aodh/aodh.conf
+        /var/lib/kolla/config_files/aodh-evaluator.json:
+          command: /usr/bin/aodh-evaluator
       docker_config:
         step_4:
           aodh_evaluator:
@@ -72,9 +70,16 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/aodh-evaluator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/aodh/:/var/lib/kolla/config_files/src:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/aodh-evaluator.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable openstack-aodh-evaluator service
+          tags: step2
+          service: name=openstack-aodh-evaluator.service state=stopped enabled=no