From 98a0fdbef343c20c5054abea478a81e5b86c254f Mon Sep 17 00:00:00 2001 From: Nicolas Vollmar Date: Fri, 19 Apr 2024 23:59:17 +0200 Subject: T6246: improve haproxy http check configuration (cherry picked from commit 050f24770aec7a74c1a07ba64cf2cb83afb72f1a) --- src/conf_mode/load-balancing_reverse-proxy.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/conf_mode/load-balancing_reverse-proxy.py b/src/conf_mode/load-balancing_reverse-proxy.py index 9f895c4e2..1569d8d71 100755 --- a/src/conf_mode/load-balancing_reverse-proxy.py +++ b/src/conf_mode/load-balancing_reverse-proxy.py @@ -75,6 +75,10 @@ def verify(lb): raise ConfigError(f'"TCP" port "{tmp_port}" is used by another service') for back, back_config in lb['backend'].items(): + if 'http-check' in back_config: + http_check = back_config['http-check'] + if 'expect' in http_check and 'status' in http_check['expect'] and 'string' in http_check['expect']: + raise ConfigError(f'"expect status" and "expect string" can not be configured together!') if 'server' not in back_config: raise ConfigError(f'"{back} server" must be configured!') for bk_server, bk_server_conf in back_config['server'].items(): -- cgit v1.2.3