From fc5db78f7b8d1cc95b5f28d9078c6840cf6cd1c6 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Mon, 12 Nov 2018 17:36:53 +0100
Subject: [PATCH] added redis params to config handling
---
inventory_provider/config.py | 16 +++++++++++++++-
test/test_data_routes.py | 4 ++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/inventory_provider/config.py b/inventory_provider/config.py
index b6631ad3..36d81463 100644
--- a/inventory_provider/config.py
+++ b/inventory_provider/config.py
@@ -29,9 +29,23 @@ CONFIG_SCHEMA = {
},
"required": ["private-key", "known-hosts"],
"additionalProperties": False
+ },
+ "redis": {
+ "type": "object",
+ "properties": {
+ "hostname": {"type": "string"},
+ "port": {"type": "integer"}
+ },
+ "required": ["hostname", "port"],
+ "additionalProperties": False
}
},
- "required": ["alarms-db", "oid_list.conf", "routers_community.conf"],
+ "required": [
+ "alarms-db",
+ "oid_list.conf",
+ "routers_community.conf",
+ "ssh",
+ "redis"],
"additionalProperties": False
}
diff --git a/test/test_data_routes.py b/test/test_data_routes.py
index 617e89e6..967a8894 100644
--- a/test/test_data_routes.py
+++ b/test/test_data_routes.py
@@ -94,6 +94,10 @@ def data_config_filename(tmp_dir_name):
"ssh": {
"private-key": "private-key-filename",
"known-hosts": "known-hosts=filename"
+ },
+ "redis": {
+ "hostname": "xxxxxx",
+ "port": 6379
}
}
--
GitLab