openstack/charm-ceph-radosgw
Code Issues Proposed changes

Add otp pool to broker request

Browse Source 
Ceph RADOS gateway >= Mimic has an additional metadata pool (otp).

Add this to the broker request to ensure that its created correctly
by the ceph-mon application rather than being auto-created by the
radosgw application

Change-Id: I5e9b4e449bd1bc300225d223329bb62f3a381705
Closes-Bug: 1921453
This commit is contained in:
James Page 2021-04-13 10:43:39 +01:00
parent 358121d74c
commit 15d7a9d827
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/ceph_rgw.py
View File

@ -196,6 +196,7 @@ def get_create_rgw_pools_rq(prefix=None):
'.rgw.log',
'.rgw.intent-log',
'.rgw.meta',
'.rgw.otp',
'.rgw.usage',
'.rgw.users.keys',
'.rgw.users.email',

14
unit_tests/test_ceph.py
View File

@ -83,6 +83,9 @@ class CephRadosGWCephTests(CharmTestCase):
call('us-east.rgw.meta', replica_count=3, pg_num=10, weight=None,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
call('us-east.rgw.otp', replica_count=3, pg_num=10, weight=None,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
call('us-east.rgw.usage', replica_count=3, pg_num=10, weight=None,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
@ -136,6 +139,9 @@ class CephRadosGWCephTests(CharmTestCase):
call('us-east.rgw.meta', replica_count=3, pg_num=10, weight=None,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
call('us-east.rgw.otp', replica_count=3, pg_num=10, weight=None,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
call('us-east.rgw.usage', replica_count=3, pg_num=10, weight=None,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
@ -198,6 +204,9 @@ class CephRadosGWCephTests(CharmTestCase):
call('default.rgw.meta', replica_count=3, pg_num=None, weight=0.1,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
call('default.rgw.otp', replica_count=3, pg_num=None, weight=0.1,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
call('default.rgw.usage', replica_count=3, pg_num=None, weight=0.1,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
@ -254,6 +263,9 @@ class CephRadosGWCephTests(CharmTestCase):
call('default.rgw.meta', replica_count=3, pg_num=None, weight=0.1,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
call('default.rgw.otp', replica_count=3, pg_num=None, weight=0.1,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
call('default.rgw.usage', replica_count=3, pg_num=None, weight=0.1,
group='objects', namespace=None, app_name='rgw',
max_bytes=None, max_objects=None),
@ -335,6 +347,8 @@ class CephRadosGWCephTests(CharmTestCase):
group='objects', app_name='rgw'),
call(weight=0.10, replica_count=3, name='default.rgw.meta',
group='objects', app_name='rgw'),
call(weight=0.10, replica_count=3, name='default.rgw.otp',
group='objects', app_name='rgw'),
call(weight=0.10, replica_count=3, name='default.rgw.usage',
group='objects', app_name='rgw'),
call(weight=0.10, replica_count=3, name='default.rgw.users.keys',