Merge "Change neutron-metadata number of workers determination method"

[apex-tripleo-heat-templates.git] / puppet / services / ceilometer-expirer.yaml

diff --git a/puppet/services/ceilometer-expirer.yaml b/puppet/services/ceilometer-expirer.yaml
index 5341cfe..529b84f 100644 (file)
--- a/puppet/services/ceilometer-expirer.yaml
+++ b/puppet/services/ceilometer-expirer.yaml
@@ -2,6 +2,8 @@ heat_template_version: ocata
 
 description: >
   OpenStack Ceilometer Expirer service configured with Puppet
+  Note, This service is deprecated and will be removed in
+  future releases.
 
 parameters:
   ServiceNetMap:
@@ -13,6 +15,14 @@ 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
@@ -29,6 +39,8 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
@@ -40,7 +52,3 @@ outputs:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |
         include ::tripleo::profile::base::ceilometer::expirer
-      upgrade_tasks:
-        - name: "PreUpgrade step0,validation: Check service openstack-ceilometer-expirer is running"
-          shell: /usr/bin/systemctl show 'openstack-ceilometer-expirer' --property ActiveState | grep '\bactive\b'
-          tags: step0,validation