openstack
/
charm-glance
Code Issues Proposed changes

Request appropriate Ceph application name for pools created 

Change-Id: I66c7ff150df936a765d753ba0c8eb93631a8da23
This commit is contained in:
Frode Nordahl 2019-03-13 15:13:48 +01:00
parent 733b901467
commit 37bb5bf8f6
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/glance_relations.py
View File

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

6
unit_tests/test_glance_relations.py
View File

@ -354,13 +354,15 @@ class GlanceRelationTests(CharmTestCase):
name='glance', name='glance',
replica_count=3, replica_count=3,
weight=6, weight=6,
group='images') group='images',
app_name='rbd')
mock_request_access.assert_not_called() mock_request_access.assert_not_called()
self.test_config.set('restrict-ceph-pools', True) self.test_config.set('restrict-ceph-pools', True)
relations.get_ceph_request() relations.get_ceph_request()
mock_create_pool.assert_called_with(name='glance', replica_count=3, mock_create_pool.assert_called_with(name='glance', replica_count=3,
weight=6, group='images') weight=6, group='images',
app_name='rbd')
mock_request_access.assert_has_calls([ mock_request_access.assert_has_calls([
call( call(
name='images', name='images',