Merge branch 'improvement/BB-522' into tmp/octopus/w/8.7/improvement/B…

…B-522
scality · Oct 2, 2024 · 63be3fe · 63be3fe
2 parents 92520d5 + d20c311
commit 63be3fe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/conf/config.json b/conf/config.json
@@ -332,6 +332,10 @@
         "host": "127.0.0.1",
         "port": 6379
     },
+    "redis": {
+        "host": "localhost",
+        "port": 6379
+    },
     "certFilePaths": {
         "key": "",
         "cert": "",

diff --git a/lib/config.joi.js b/lib/config.joi.js
@@ -67,8 +67,16 @@ const joiSchema = joi.object({
         port: joi.number().default(8900),
     },
     redis: {
-        host: joi.string().default('localhost'),
-        port: joi.number().default(6379),
+        host: joi.string().when('sentinels', {
+            is: joi.exist(),
+            then: joi.forbidden(),
+            otherwise: joi.required(),
+        }),
+        port: joi.number().when('sentinels', {
+            is: joi.exist(),
+            then: joi.forbidden(),
+            otherwise: joi.required(),
+        }),
         name: joi.string().default('backbeat'),
         password: joi.string().default('').allow(''),
         sentinels: joi.alternatives([joi.string(), joi.array().items(