Merge "Ensure upgrade step orchestration accross roles."

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

diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml
index 084e765..b405660 100644 (file)
--- a/docker/services/aodh-notifier.yaml
+++ b/docker/services/aodh-notifier.yaml
@@ -57,13 +57,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerAodhNotifierImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/aodh-notifier.json:
-           command: /usr/bin/aodh-notifier
-           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-notifier.json:
+          command: /usr/bin/aodh-notifier
       docker_config:
         step_4:
           aodh_notifier:
@@ -73,8 +68,12 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/aodh-notifier.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/aodh/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable openstack-aodh-notifier service
+          tags: step2
+          service: name=openstack-aodh-notifier.service state=stopped enabled=no