From af2ee6477bbd2979363ec670e707ef6ef933f7f8 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Fri, 18 Nov 2016 13:58:31 +0300 Subject: [PATCH] Adjust validation to pass through complex readiness probes We need to pass complex (dict-based) readiness probes through to entrypoint to handle. Keep backward compatibility with old oneline readiness probes for now. Change-Id: I2e8aaeeabcb0c2ddfcf605008763a7a938a578b4 --- fuel_ccp/validation/service.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fuel_ccp/validation/service.py b/fuel_ccp/validation/service.py index 27ab74fe..a0415fab 100644 --- a/fuel_ccp/validation/service.py +++ b/fuel_ccp/validation/service.py @@ -214,7 +214,10 @@ SERVICE_SCHEMA = { "additionalProperties": False, "properties": { - "readiness": NOT_EMPTY_STRING_SCHEMA, + "readiness": {"oneOf": [ + NOT_EMPTY_STRING_SCHEMA, + PROBE_SCHEMA, + ]}, "liveness": PROBE_SCHEMA } },