X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fservices%2Fmanila-backend-cephfs.yaml;h=36ef1ea91cc6bb68952126e724a2fe1fa117af80;hb=c3fd3147e4340dcd1cddbf32bdcfc31d6e907e5b;hp=0fc39e2a5bad7a3b52d831260a6f0945e4ef4096;hpb=8b9e9ff4ccbe52979f68416a96a863e9379d2619;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/manila-backend-cephfs.yaml b/puppet/services/manila-backend-cephfs.yaml
index 0fc39e2a..36ef1ea9 100644
--- a/puppet/services/manila-backend-cephfs.yaml
+++ b/puppet/services/manila-backend-cephfs.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   Openstack Manila Cephfs backend
@@ -40,6 +40,20 @@ parameters:
   ManilaCephFSNativeCephFSEnableSnapshots:
     type: boolean
     default: true
+  ManilaCephFSDataPoolName:
+    default: manila_data
+    type: string
+  ManilaCephFSMetadataPoolName:
+    default: manila_metadata
+    type: string
+  # (jprovazn) default value is set to assure this templates works with an
+  # external ceph too (user/key is created only when ceph is deployed by
+  # TripleO)
+  CephManilaClientKey:
+    default: ''
+    description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
+    type: string
+    hidden: true
 
 outputs:
   role_data:
@@ -54,4 +68,8 @@ outputs:
         manila::backend::cephfsnative::cephfs_auth_id: {get_param: ManilaCephFSNativeCephFSAuthId}
         manila::backend::cephfsnative::cephfs_cluster_name: {get_param: ManilaCephFSNativeCephFSClusterName}
         manila::backend::cephfsnative::cephfs_enable_snapshots: {get_param: ManilaCephFSNativeCephFSEnableSnapshots}
+        manila::backend::cephfsnative::ceph_client_key: {get_param: CephManilaClientKey}
+        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: