Merge "Containerize Redis service"

[apex-tripleo-heat-templates.git] / puppet / services / manila-backend-cephfs.yaml

diff --git a/puppet/services/manila-backend-cephfs.yaml b/puppet/services/manila-backend-cephfs.yaml
index 89a36d2..2a6d7e3 100644 (file)
--- 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
@@ -19,9 +19,6 @@ parameters:
                  via parameter_defaults in the resource registry.
     type: json
   # CephFS Native backend params:
-  ManilaCephFSNativeEnableBackend:
-    type: boolean
-    default: false
   ManilaCephFSNativeBackendName:
     type: string
     default: cephfsnative
@@ -33,7 +30,7 @@ parameters:
     default: 'cephfs'
   ManilaCephFSNativeCephFSConfPath:
     type: string
-    default: '/etc/ceph/cephfs.conf'
+    default: '/etc/ceph/ceph.conf'
   ManilaCephFSNativeCephFSAuthId:
     type: string
     default: 'manila'
@@ -42,7 +39,21 @@ parameters:
     default: 'ceph'
   ManilaCephFSNativeCephFSEnableSnapshots:
     type: boolean
-    default: true
+    default: false
+  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:
@@ -50,7 +61,6 @@ outputs:
     value:
       service_name: manila_backend_cephfs
       config_settings:
-        manila::backend::cephfsnative::enable_backend: {get_param: ManilaCephFSNativeEnableBackend}
         manila::backend::cephfsnative::title: {get_param: ManilaCephFSNativeBackendName}
         manila::backend::cephfsnative::driver_handles_share_servers: {get_param: ManilaCephFSNativeDriverHandlesShareServers}
         manila::backend::cephfsnative::share_backend_name: {get_param: ManilaCephFSNativeShareBackendName}
@@ -58,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: