From de316e6467d3b88db9e1775379a090cc2238ddc3 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 8 May 2020 10:01:14 +0200
Subject: [PATCH] renamed celery db index config param
---
inventory_provider/config.py | 4 ++--
inventory_provider/tasks/config.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/inventory_provider/config.py b/inventory_provider/config.py
index eac27acf..abf3645f 100644
--- a/inventory_provider/config.py
+++ b/inventory_provider/config.py
@@ -37,7 +37,7 @@ CONFIG_SCHEMA = {
"properties": {
"hostname": {"type": "string"},
"port": {"type": "integer"},
- "index": {"type": "integer"},
+ "celery-db-index": {"type": "integer"},
"socket_timeout": {"$ref": "#/definitions/timeout"}
},
"required": ["hostname", "port"],
@@ -48,7 +48,7 @@ CONFIG_SCHEMA = {
"properties": {
"hostname": {"type": "string"},
"port": {"type": "integer"},
- "index": {"type": "integer"},
+ "celery-db-index": {"type": "integer"},
"name": {"type": "string"},
"redis_socket_timeout": {"$ref": "#/definitions/timeout"},
"sentinel_socket_timeout": {"$ref": "#/definitions/timeout"}
diff --git a/inventory_provider/tasks/config.py b/inventory_provider/tasks/config.py
index 2ce619c3..2026f9a6 100644
--- a/inventory_provider/tasks/config.py
+++ b/inventory_provider/tasks/config.py
@@ -1,9 +1,9 @@
import logging
import os
from inventory_provider import config
-import redis.sentinel
logger = logging.getLogger(__name__)
+DEFAULT_CELERY_DB_INDEX = 1
assert os.path.isfile(os.environ['INVENTORY_PROVIDER_CONFIG_FILENAME']), (
'config file %r not found' %
@@ -35,7 +35,7 @@ if 'redis_socket_timeout' in params:
_broker_hostname = params['hostname']
_broker_port = params['port']
-_broker_db_index = params.get('index', 1)
+_broker_db_index = params.get('celery-db-index', DEFAULT_CELERY_DB_INDEX)
if ':' in _broker_hostname:
# assume this means hostname is an ipv6 address
--
GitLab