openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix parameter name used to create the Manila CephX keyring 

We obsoleted the CephFS native parameter but missed to update it
in the Ceph profile.

Change-Id: I12a91da7df6079d391fa9583c4f2c926d123044f
Closes-Bug: #1783341
This commit is contained in:
Giulio Fidente 2018-07-24 23:53:57 +02:00
parent 7499685bcd
commit 787e7910a8
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -128,7 +128,7 @@ parameters:
description: default minimum replication for RBD copies
type: number
default: 3
ManilaCephFSNativeCephFSAuthId:
ManilaCephFSCephFSAuthId:
default: manila
type: string
CephManilaClientKey:
@ -278,7 +278,7 @@ resources:
list_join:
- '.'
- - client
- {get_param: ManilaCephFSNativeCephFSAuthId}
- {get_param: ManilaCephFSCephFSAuthId}
key: {get_param: CephManilaClientKey}
caps:
mgr: "allow *"

4
docker/services/ceph-ansible/ceph-mds.yaml
View File

@ -47,7 +47,7 @@ parameters:
ManilaCephFSMetadataPoolPGNum:
default: 128
type: number
ManilaCephFSNativeShareBackendName:
ManilaCephFSShareBackendName:
default: cephfs
type: string
@ -70,7 +70,7 @@ resources:
vars:
cephfs_data: {get_param: ManilaCephFSDataPoolName}
cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
cephfs: {get_param: ManilaCephFSNativeShareBackendName}
cephfs: {get_param: ManilaCephFSShareBackendName}
cephfs_pools:
- { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
- { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }

11
releasenotes/notes/deprecate-manila-cephfsnative-parameters-e24978c8b344573b.yaml Normal file
View File

@ -0,0 +1,11 @@
---
deprecations:
- |
The following parameters are deprecated when deploying Manila with CephFS:
ManilaCephFSNativeShareBackendName, use ManilaCephFSShareBackendName instead
ManilaCephFSNativeBackendName, use ManilaCephFSBackendName instead
ManilaCephFSNativeCephFSAuthId, use ManilaCephFSCephFSAuthId instead
ManilaCephFSNativeDriverHandlesShareServers, use ManilaCephFSDriverHandlesShareServers instead
ManilaCephFSNativeCephFSEnableSnapshots, use ManilaCephFSCephFSEnableSnapshots instead
ManilaCephFSNativeCephFSClusterName, matches CephClusterName parameter
ManilaCephFSNativeCephFSConfPath, autogenerated from CephClusterName