Revert "Support same projects in different domain"
This reverts commit 471437e455
.
Change-Id: I49562a04c41a4aca18a88c5b6565d678067b3667
This commit is contained in:
parent
471437e455
commit
75d7aff659
|
@ -34,10 +34,6 @@ GNOCCHI_OPTS = [
|
|||
default="service",
|
||||
help='Project name of resources creator in Gnocchi. '
|
||||
'(For example the Ceilometer project name'),
|
||||
cfg.StrOpt('gnocchi_external_domain_name',
|
||||
default="Default",
|
||||
help='Domain name of resources creator in Gnocchi. '
|
||||
'(For example, default or service_domain'),
|
||||
]
|
||||
|
||||
|
||||
|
@ -143,12 +139,8 @@ class AggregationMetricByResourcesLookupRule(AlarmGnocchiThresholdRule):
|
|||
def get_external_project_owner():
|
||||
kc = keystone_client.get_client(pecan.request.cfg)
|
||||
project_name = pecan.request.cfg.api.gnocchi_external_project_owner
|
||||
domain_name = pecan.request.cfg.api.gnocchi_external_domain_name
|
||||
domains = kc.domains.list(name=domain_name)
|
||||
try:
|
||||
project = kc.projects.find(
|
||||
name=project_name,
|
||||
domain_id=domains[0].id)
|
||||
project = kc.projects.find(name=project_name)
|
||||
return project.id
|
||||
except ka_exceptions.NotFound:
|
||||
return None
|
||||
|
|
|
@ -2370,9 +2370,6 @@ class TestAlarmsRuleGnocchi(TestAlarmsBase):
|
|||
]}
|
||||
|
||||
ks_client = mock.Mock()
|
||||
ks_client.domains.list.return_value = [mock.Mock(
|
||||
id='<my-uuid>',
|
||||
name='Default')]
|
||||
ks_client.projects.find.return_value = mock.Mock(id='<my-uuid>')
|
||||
get_client.return_value = ks_client
|
||||
|
||||
|
|
Loading…
Reference in New Issue