openstack
/
deb-gnocchi
Code Issues Proposed changes

coordination: use redis if available 

We can use redis as coordinator if storage is redis.

So this change does it.

Change-Id: I5d9f6fe155935a2bebb16ca5ece76bd90310c3e4
This commit is contained in:
Mehdi Abaakouk 2017-04-25 16:36:23 +02:00
parent 657b66f1b0
commit 68bd5bfed7
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnocchi/service.py
View File

@ -59,14 +59,23 @@ def prepare_service(args=None, conf=None,
# If no coordination URL is provided, default to using the indexer as
# coordinator
if conf.storage.coordination_url is None:
parsed = urlparse.urlparse(conf.indexer.url)
proto, _, _ = parsed.scheme.partition("+")
parsed = list(parsed)
# Set proto without the + part
parsed[0] = proto
conf.set_default("coordination_url",
urlparse.urlunparse(parsed),
"storage")
if conf.storage.driver == "redis":
conf.set_default("coordination_url",
conf.storage.redis_url,
"storage")
elif conf.incoming.driver == "redis":
conf.set_default("coordination_url",
conf.incoming.redis_url,
"storage")
else:
parsed = urlparse.urlparse(conf.indexer.url)
proto, _, _ = parsed.scheme.partition("+")
parsed = list(parsed)
# Set proto without the + part
parsed[0] = proto
conf.set_default("coordination_url",
urlparse.urlunparse(parsed),
"storage")
cfg_path = conf.oslo_policy.policy_file
if not os.path.isabs(cfg_path):