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

diff --git a/puppet/services/ceph-client.yaml b/puppet/services/ceph-client.yaml
index fc23f719..a9e4621a 100644
--- a/puppet/services/ceph-client.yaml
+++ b/puppet/services/ceph-client.yaml
@@ -4,6 +4,15 @@ 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
@@ -13,12 +22,16 @@ parameters:
 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
+      service_name: ceph_client
       config_settings:
         get_attr: [CephBase, role_data, config_settings]
       step_config: |