summaryrefslogtreecommitdiff
path: root/ceilometer/opts.py
diff options
context:
space:
mode:
authorFelix Walter <felix.walter@cloudandheat.com>2018-06-11 15:12:42 +0200
committerFelix Walter <felix.walter@cloudandheat.com>2018-06-11 16:37:02 +0200
commit246d01beb598f45ae5ac7f8bc6f40249d9253fe5 (patch)
tree9615e5c6289680a2ed869325db8e45706b324af8 /ceilometer/opts.py
parent8f068ebbd35a781b58981dabff05312f36a39447 (diff)
downloadceilometer-246d01beb598f45ae5ac7f8bc6f40249d9253fe5.tar.gz
objectstore/rgw: Add config option to support RGW implicit tenants
If "rgw keystone implicit tenants" is enabled for Rados Gateway to enable Multi-Tenacy [1], the created RGW user IDs are in the format "keystone_project_id$keystone_project_id", i.e. the RGW tenant ID is added to the user ID. This breaks metering via Ceilometer as the usage is always queried for uid=keystone_project_id. If implicit tenants are enabled in RGW, Ceilometer has to query based on the adapted used IDs. This commit introduces support for querying the correct user accounts. [1] http://docs.ceph.com/docs/mimic/radosgw/multitenancy/ Change-Id: I6de4c5ce0e4f59c1d952f8fd39de64937e781280 Signed-off-by: Felix Walter <felix.walter@cloudandheat.com>
Diffstat (limited to 'ceilometer/opts.py')
-rw-r--r--ceilometer/opts.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/ceilometer/opts.py b/ceilometer/opts.py
index 837fbd7f..d3910138 100644
--- a/ceilometer/opts.py
+++ b/ceilometer/opts.py
@@ -130,6 +130,7 @@ def list_opts():
('publisher', ceilometer.publisher.utils.OPTS),
('publisher_notifier', ceilometer.publisher.messaging.NOTIFIER_OPTS),
('rgw_admin_credentials', ceilometer.objectstore.rgw.CREDENTIAL_OPTS),
+ ('rgw_client', ceilometer.objectstore.rgw.CLIENT_OPTS),
('service_types',
itertools.chain(ceilometer.image.discovery.SERVICE_OPTS,
ceilometer.neutron_client.SERVICE_OPTS,