openstack
/
charms.ceph
Code Issues Proposed changes

Amend rbd-mirror capabilities 

Update rbd-mirror key caps to use the rbd-mirror-peer mon profile.

This adds required config get/set permissions for the rbd-mirror
daemon.

Also add permission to use the service {dump,status} mon commands;
these are not required by the rbd-mirror daemon but are needed by
the charm to check pool mirror status.

Change-Id: Ia5efa090f5b7fa23d7261da53592d6a527dcbfe1
Closes-Bug: 1879749
This commit is contained in:
James Page 2022-04-20 16:24:42 +01:00
parent 5745ed3ba8
commit 89f5ee0d04
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
charms_ceph/utils.py
View File

@ -1167,7 +1167,10 @@ osd_upgrade_caps = collections.OrderedDict([
])
rbd_mirror_caps = collections.OrderedDict([
('mon', ['profile rbd; allow r']),
('mon', ['allow profile rbd-mirror-peer',
'allow command "service dump"',
'allow command "service status"'
]),
('osd', ['profile rbd']),
('mgr', ['allow r']),
])

4
unit_tests/test_utils.py
View File

@ -1099,7 +1099,9 @@ class CephTestCase(unittest.TestCase):
_get_named_key.assert_called_once_with(
name='someid',
caps=collections.OrderedDict([
('mon', ['profile rbd; allow r']),
('mon', ['allow profile rbd-mirror-peer',
'allow command "service dump"',
'allow command "service status"']),
('osd', ['profile rbd']),
('mgr', ['allow r']),
])