X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceph-client.yaml;h=f972e21b102127eac5e846327da3bf2a3819f129;hb=c3c1b7496ed8942caaeaf9c132531af999af8632;hp=ca920a5f44f2cec497269673c686ef165549c5b4;hpb=81ee3b79d01f065528b0e17675aba311863c25b2;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceph-client.yaml b/puppet/services/ceph-client.yaml
index ca920a5f..f972e21b 100644
--- a/puppet/services/ceph-client.yaml
+++ b/puppet/services/ceph-client.yaml
@@ -1,23 +1,41 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   Ceph Client service.
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    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:
     type: ./ceph-base.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
 
 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: |