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

diff --git a/puppet/services/aodh-listener.yaml b/puppet/services/aodh-listener.yaml
index bc1ccde7..631a3dc1 100644
--- a/puppet/services/aodh-listener.yaml
+++ b/puppet/services/aodh-listener.yaml
@@ -1,9 +1,13 @@
-heat_template_version: 2016-04-08
+heat_template_version: pike
 
 description: >
   OpenStack Aodh Listener service configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -13,26 +17,55 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     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:
     type: ./aodh-base.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
     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