openstack/charm-nova-compute
Code Issues Proposed changes

Merge "Request class-read object_prefix rbd_children perm"

Browse Source
This commit is contained in:
Zuul 2018-07-17 17:43:15 +00:00 committed by Gerrit Code Review
commit 26f8ab5de4
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hooks/nova_compute_hooks.py
View File

@ -337,12 +337,18 @@ def get_ceph_request():
rq.add_op_create_pool(name=name, replica_count=replicas, weight=weight,
group='vms')
if config('restrict-ceph-pools'):
rq.add_op_request_access_to_group(name="volumes",
permission='rwx')
rq.add_op_request_access_to_group(name="images",
permission='rwx')
rq.add_op_request_access_to_group(name="vms",
permission='rwx')
rq.add_op_request_access_to_group(
name="volumes",
object_prefix_permissions={'class-read': ['rbd_children']},
permission='rwx')
rq.add_op_request_access_to_group(
name="images",
object_prefix_permissions={'class-read': ['rbd_children']},
permission='rwx')
rq.add_op_request_access_to_group(
name="vms",
object_prefix_permissions={'class-read': ['rbd_children']},
permission='rwx')
return rq

12
unit_tests/test_nova_compute_hooks.py
View File

@ -480,9 +480,15 @@ class NovaComputeRelationsTests(CharmTestCase):
weight=28,
group='vms')
mock_request_access.assert_has_calls([
call(name='volumes', permission='rwx'),
call(name='images', permission='rwx'),
call(name='vms', permission='rwx'),
call(name='volumes',
object_prefix_permissions={'class-read': ['rbd_children']},
permission='rwx'),
call(name='images',
object_prefix_permissions={'class-read': ['rbd_children']},
permission='rwx'),
call(name='vms',
object_prefix_permissions={'class-read': ['rbd_children']},
permission='rwx'),
])
@patch.object(hooks, 'service_restart_handler')