openstack/manila
Code Issues Proposed changes

Merge "Add filesystem info to FSAL in CephFS NFS" into stable/xena

Browse Source
This commit is contained in:
Zuul 2023-04-10 17:07:20 +00:00 committed by Gerrit Code Review
commit af9d0658aa
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manila/share/drivers/cephfs/driver.py
View File

@ -1055,7 +1055,8 @@ class NFSProtocolHelper(ganesha.GaneshaNASHelper2):
return {
'Name': 'Ceph',
'User_Id': ceph_auth_id,
'Secret_Access_Key': auth_result
'Secret_Access_Key': auth_result,
'Filesystem': self.volname
}
def _cleanup_fsal_hook(self, base, share, access):

3
manila/tests/share/drivers/cephfs/test_driver.py
View File

@ -1150,7 +1150,8 @@ class NFSProtocolHelperTestCase(test.TestCase):
expected_ret = {
"Name": "Ceph",
"User_Id": "ganesha-fakeid",
"Secret_Access_Key": "ganesha-zorilla"
"Secret_Access_Key": "ganesha-zorilla",
"Filesystem": self._nfs_helper.volname
}
driver.rados_command.return_value = 'ganesha-zorilla'

7
releasenotes/notes/bug-1991938-add-filesystem-info-cephfs-nfs-fsal-b39ae5ebaeb6fba1.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Add the filesystem info in the exports created by the CephFS NFS driver.
This fixes inconsistencies when deploying Manila with CephFS NFS with
multiple filesystems.