openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Set manila cephfs backend if ceph is deployed 

Depends-On: Iac4a260af6738ed6afd4bcb107221a736d07c1b5
Change-Id: I279f6080b3cd7cf6be8513d94171bf9ff94a4698
Partial-Bug: #1644784
This commit is contained in:
Jan Provaznik 2016-12-09 09:37:26 +01:00 committed by Jan Provaznik
parent d19ae9f490
commit 45522a939f
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
puppet/services/ceph-mon.yaml
View File

@ -28,6 +28,12 @@ parameters:
CinderRbdPoolName:
default: volumes
type: string
ManilaCephFSDataPoolName:
default: manila_data
type: string
ManilaCephFSMetadataPoolName:
default: manila_metadata
type: string
CinderBackupRbdPoolName:
default: backups
type: string
@ -87,6 +93,8 @@ outputs:
for_each:
<%pool%>:
- {get_param: CinderRbdPoolName}
- {get_param: ManilaCephFSDataPoolName}
- {get_param: ManilaCephFSMetadataPoolName}
- {get_param: CinderBackupRbdPoolName}
- {get_param: NovaRbdPoolName}
- {get_param: GlanceRbdPoolName}

18
puppet/services/manila-backend-cephfs.yaml
View File

@ -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: