X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceph-client.yaml;h=ec34fcae02f2e4dbaf2c6ea72ec686eca2840c7f;hb=2f5f8fcb2bbd2b9299ac0097a210ba4939d30dc4;hp=a9e4621aa06f938449935436320e521c05bee391;hpb=d67627b418f050d4afc9034c650276d58e6f9c49;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceph-client.yaml b/puppet/services/ceph-client.yaml
index a9e4621a..ec34fcae 100644
--- a/puppet/services/ceph-client.yaml
+++ b/puppet/services/ceph-client.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: pike
 
 description: >
   Ceph Client service.
@@ -13,11 +13,22 @@ 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
+  MonitoringSubscriptionCephClient:
+    default: 'overcloud-ceph-client'
+    type: string
 
 resources:
   CephBase:
@@ -26,12 +37,15 @@ resources:
       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 Cinder OSD service.
     value:
       service_name: ceph_client
+      monitoring_subscription: {get_param: MonitoringSubscriptionCephClient}
       config_settings:
         get_attr: [CephBase, role_data, config_settings]
       step_config: |