Merge "Disable xinetd class when creating swift-storage puppet configuration" into...

[apex-tripleo-heat-templates.git] / puppet / services / ceph-mds.yaml

diff --git a/puppet/services/ceph-mds.yaml b/puppet/services/ceph-mds.yaml
index b68567f..ad799ed 100644 (file)
--- a/puppet/services/ceph-mds.yaml
+++ b/puppet/services/ceph-mds.yaml
@@ -1,9 +1,13 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Ceph MDS service.
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -13,6 +17,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
@@ -23,14 +35,26 @@ parameters:
                  with ceph-authtool --gen-print-key.
     type: string
     hidden: true
+  ManilaCephFSDataPoolName:
+    default: manila_data
+    type: string
+  ManilaCephFSMetadataPoolName:
+    default: manila_metadata
+    type: string
+  ManilaCephFSNativeShareBackendName:
+    default: cephfs
+    type: string
 
 resources:
   CephBase:
     type: ./ceph-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:
@@ -45,5 +69,8 @@ outputs:
               '112 ceph_mds':
                 dport:
                   - '6800-7300'
+            ceph::profile::params::fs_data_pool: {get_param: ManilaCephFSDataPoolName}
+            ceph::profile::params::fs_metadata_pool: {get_param: ManilaCephFSMetadataPoolName}
+            ceph::profile::params::fs_name: {get_param: ManilaCephFSNativeShareBackendName}
       step_config: |
         include ::tripleo::profile::base::ceph::mds