Request appropriate Ceph application name for pools created

Change-Id: Ic020bc360165132cb3cc34372eded69355576294
This commit is contained in:
Frode Nordahl 2019-03-13 15:46:33 +01:00
parent 316bf6cd85
commit 82f43532e5
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
2 changed files with 3 additions and 3 deletions

View File

@ -355,7 +355,7 @@ def get_ceph_request():
replicas = config('ceph-osd-replication-count')
weight = config('ceph-pool-weight')
rq.add_op_create_pool(name=name, replica_count=replicas, weight=weight,
group='vms')
group='vms', app_name='rbd')
if config('restrict-ceph-pools'):
rq.add_op_request_access_to_group(
name="volumes",

View File

@ -482,7 +482,7 @@ class NovaComputeRelationsTests(CharmTestCase):
hooks.get_ceph_request()
mock_create_pool.assert_called_with(name='nova', replica_count=3,
weight=28,
group='vms')
group='vms', app_name='rbd')
mock_request_access.assert_not_called()
@patch('charmhelpers.contrib.storage.linux.ceph.CephBrokerRq'
@ -500,7 +500,7 @@ class NovaComputeRelationsTests(CharmTestCase):
hooks.get_ceph_request()
mock_create_pool.assert_called_with(name='nova', replica_count=3,
weight=28,
group='vms')
group='vms', app_name='rbd')
mock_request_access.assert_has_calls([
call(name='volumes',
object_prefix_permissions={'class-read': ['rbd_children']},