From 31c60a67c41821413946b3c35bc81e425c7db55c Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Thu, 2 Jan 2020 16:32:43 +0100
Subject: [PATCH] added 'socket_timeout' param to redis/sentinel config schema
---
inventory_provider/config.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/inventory_provider/config.py b/inventory_provider/config.py
index 9162ab9b..21a78d9b 100644
--- a/inventory_provider/config.py
+++ b/inventory_provider/config.py
@@ -16,7 +16,11 @@ CONFIG_SCHEMA = {
},
"required": ["hostname", "dbname", "username", "password"],
"additionalProperties": False
-
+ },
+ "timeout": {
+ "type": "number",
+ "maximum": 10, # sanity
+ "exclusiveMinimum": 0
}
},
@@ -37,7 +41,8 @@ CONFIG_SCHEMA = {
"type": "object",
"properties": {
"hostname": {"type": "string"},
- "port": {"type": "integer"}
+ "port": {"type": "integer"},
+ "socket_timeout": {"$ref": "#/definitions/timeout"}
},
"required": ["hostname", "port"],
"additionalProperties": False
@@ -47,7 +52,8 @@ CONFIG_SCHEMA = {
"properties": {
"hostname": {"type": "string"},
"port": {"type": "integer"},
- "name": {"type": "string"}
+ "name": {"type": "string"},
+ "socket_timeout": {"$ref": "#/definitions/timeout"}
},
"required": ["hostname", "port", "name"],
"additionalProperties": False
--
GitLab