Change flat network name for nosdn fdio scenario

[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 36ef1ea..9207d99 100644 (file)
--- a/puppet/services/manila-backend-cephfs.yaml
+++ b/puppet/services/manila-backend-cephfs.yaml
@@ -1,9 +1,13 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Openstack Manila Cephfs backend
 
 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
@@ -39,13 +51,7 @@ parameters:
     default: 'ceph'
   ManilaCephFSNativeCephFSEnableSnapshots:
     type: boolean
-    default: true
-  ManilaCephFSDataPoolName:
-    default: manila_data
-    type: string
-  ManilaCephFSMetadataPoolName:
-    default: manila_metadata
-    type: string
+    default: false
   # (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)
@@ -69,7 +75,4 @@ outputs:
         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: