From 4024536621616c6df88686d80694b48dec612010 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Thu, 8 Oct 2020 17:10:35 -0700 Subject: [PATCH] Fix PROXYV2 pools There was a bug in the initial PROXYV2 patch that causes pools to go into ERROR when using PROXYV2 protocol. This patch corrects that issue. Change-Id: If403a90ec27721ef63b6ae666fd77dfc9df0295e Story: 2008237 Task: 41080 --- octavia/common/jinja/haproxy/combined_listeners/jinja_cfg.py | 1 + releasenotes/notes/fix-proxyv2-44a7627294922a8e.yaml | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 releasenotes/notes/fix-proxyv2-44a7627294922a8e.yaml diff --git a/octavia/common/jinja/haproxy/combined_listeners/jinja_cfg.py b/octavia/common/jinja/haproxy/combined_listeners/jinja_cfg.py index 6f3da53f85..74e73e9bb3 100644 --- a/octavia/common/jinja/haproxy/combined_listeners/jinja_cfg.py +++ b/octavia/common/jinja/haproxy/combined_listeners/jinja_cfg.py @@ -27,6 +27,7 @@ PROTOCOL_MAP = { constants.PROTOCOL_HTTP: 'http', constants.PROTOCOL_HTTPS: 'tcp', constants.PROTOCOL_PROXY: 'proxy', + lib_consts.PROTOCOL_PROXYV2: 'proxy', constants.PROTOCOL_TERMINATED_HTTPS: 'http' } diff --git a/releasenotes/notes/fix-proxyv2-44a7627294922a8e.yaml b/releasenotes/notes/fix-proxyv2-44a7627294922a8e.yaml new file mode 100644 index 0000000000..84c3681930 --- /dev/null +++ b/releasenotes/notes/fix-proxyv2-44a7627294922a8e.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fixed a bug where pools with PROXYV2 will go into ERROR.