openstack
/
trove
Code Issues Proposed changes

Removes the deprecated argument tenant from TroveContext 

The tenant argument of RequestContext in oslo.context had been
deprecated long time ago and it was finally removed in
oslo.context-4.0.0. We should remove the tenant argument of
TroveContext that derives from RequestContext and we should also
update the requirements.txt in the master branch.

The original problem of this patch is the Configurations API
errors in following cases:
* when getting a configuration.
* when adding a new configuration parameter.

Story: 2009933
Task: 44816
Change-Id: Idbd0507e6c87d6926f93806d0d1eef13f557d805
This commit is contained in:
Hirotaka Wakabayashi 2022-03-19 22:01:11 +09:00
parent 590984f897
commit be54e5f16d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trove/configuration/service.py
View File

@ -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()