summaryrefslogtreecommitdiff
path: root/trove
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-03-20 13:47:01 +0000
committerGerrit Code Review <review@openstack.org>2022-03-20 13:47:01 +0000
commite4bf4222b4e6b29c0a5cfef892f25abf2b523a3c (patch)
tree962d9ebb13d22966f37d4b23b3983560a8d062d3 /trove
parent04e85c1be0732b7f9333468723b1e1b26d6ddc02 (diff)
parentbe54e5f16d7c6861cc9c3d4f0f27c4cd892b1046 (diff)
downloadtrove-e4bf4222b4e6b29c0a5cfef892f25abf2b523a3c.tar.gz
Merge "Removes the deprecated argument tenant from TroveContext"
Diffstat (limited to 'trove')
-rw-r--r--trove/configuration/service.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/trove/configuration/service.py b/trove/configuration/service.py
index 48f705a0..50b4138b 100644
--- a/trove/configuration/service.py
+++ b/trove/configuration/service.py
@@ -88,7 +88,7 @@ class ConfigurationsController(wsgi.Controller):
'deleted': False
}
if not context.is_admin:
- kwargs['tenant_id'] = context.tenant
+ kwargs['tenant_id'] = context.project_id
instances = instances_models.DBInstance.find_all(**kwargs)
limit = int(context.limit or CONF.instances_page_size)
@@ -246,7 +246,7 @@ class ConfigurationsController(wsgi.Controller):
LOG.debug("Re-applying configuration group '%s' to all clusters.",
configuration_id)
clusters = cluster_models.DBCluster.find_all(
- tenant_id=context.tenant,
+ tenant_id=context.project_id,
configuration_id=configuration_id,
deleted=False).all()