X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Faodh-listener.yaml;h=f5c9330defd5b6fc1f7d2e1c747489d425010ae0;hb=82db6ab608b29e455fb2036aeb36537148b97cf9;hp=bc1ccde7dcf3909d3857bbdb9653dc2d1c2a56c0;hpb=a4b8e861999a891816c90ee1879263545cf94968;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/aodh-listener.yaml b/puppet/services/aodh-listener.yaml
index bc1ccde7..f5c9330d 100644
--- a/puppet/services/aodh-listener.yaml
+++ b/puppet/services/aodh-listener.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Aodh Listener service configured with Puppet
@@ -18,6 +18,9 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  MonitoringSubscriptionAodhListener:
+    default: 'overcloud-ceilometer-aodh-listener'
+    type: string
 
 resources:
   AodhBase:
@@ -32,7 +35,22 @@ outputs:
     description: Role data for the Aodh Listener service.
     value:
       service_name: aodh_listener
+      monitoring_subscription: {get_param: MonitoringSubscriptionAodhListener}
       config_settings:
         get_attr: [AodhBase, role_data, config_settings]
       step_config: |
         include tripleo::profile::base::aodh::listener
+      upgrade_tasks:
+        - name: Check if aodh_listener is deployed
+          command: systemctl is-enabled openstack-aodh-listener
+          tags: common
+          ignore_errors: True
+          register: aodh_listener_enabled
+        - name: "PreUpgrade step0,validation: Check service openstack-aodh-listener is running"
+          shell: /usr/bin/systemctl show 'openstack-aodh-listener' --property ActiveState | grep '\bactive\b'
+          when: aodh_listener_enabled.rc == 0
+          tags: step0,validation
+        - name: Stop aodh_listener service
+          tags: step1
+          when: aodh_listener_enabled.rc == 0
+          service: name=openstack-aodh-listener state=stopped