openstack
/
ceilometer
Code Issues Proposed changes

gnocchi: handle domain for filtering swift 

Change-Id: I41015ef4ff8ef53e5d40f6ce6e56f3098e327c43
This commit is contained in:
Mehdi Abaakouk 2018-09-18 10:26:44 +02:00
parent 42f6f68eb9
commit 04d7d0a9c4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/publisher/gnocchi.py
View File

@ -199,6 +199,7 @@ class GnocchiPublisher(publisher.ConfigPublisherBase):
options = urlparse.parse_qs(parsed_url.query)
self.filter_project = options.get('filter_project', ['service'])[-1]
self.filter_domain = options.get('filter_domain', ['Default'])[-1]
resources_definition_file = options.get(
'resources_definition_file', ['gnocchi_resources.yaml'])[-1]
@ -284,7 +285,8 @@ class GnocchiPublisher(publisher.ConfigPublisherBase):
if self._gnocchi_project_id is None:
try:
project = self._ks_client.projects.find(
name=self.filter_project)
name=self.filter_project,
domain=self.filter_domain)
except ka_exceptions.NotFound:
LOG.warning('filtered project not found in keystone,'
' ignoring the filter_project '