From 6a8f8807eb7f75960f156510546a20e07aedcce3 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Mon, 24 Aug 2020 14:55:52 -0700 Subject: [PATCH] Add proxy protocol v2 support to dashboard This patch adds support for proxy protocol v2 pools in the Octavia dashboard. Depends-On: https://review.opendev.org/747801 Change-Id: Id60c7a5edc5039c51399feda8643b714d58cf29a Story: 2005611 Task: 30858 --- .../dashboard/project/lbaasv2/workflow/model.service.js | 2 +- .../dashboard/project/lbaasv2/workflow/pool/pool.help.html | 2 +- releasenotes/notes/Add-ProxyV2-b5537c092737fe41.yaml | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/Add-ProxyV2-b5537c092737fe41.yaml diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js index d78188b1..b85dca3f 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/model.service.js @@ -92,7 +92,7 @@ l7ruleTypes: ['HOST_NAME', 'PATH', 'FILE_TYPE', 'HEADER', 'COOKIE'], l7ruleCompareTypes: ['REGEX', 'EQUAL_TO', 'STARTS_WITH', 'ENDS_WITH', 'CONTAINS'], l7ruleFileTypeCompareTypes: ['REGEX', 'EQUAL_TO'], - poolProtocols: ['HTTP', 'HTTPS', 'PROXY', 'TCP', 'UDP'], + poolProtocols: ['HTTP', 'HTTPS', 'PROXY', 'PROXYV2', 'TCP', 'UDP'], methods: ['LEAST_CONNECTIONS', 'ROUND_ROBIN', 'SOURCE_IP'], types: ['SOURCE_IP', 'HTTP_COOKIE', 'APP_COOKIE'], monitorTypes: ['HTTP', 'HTTPS', 'PING', 'TCP', 'TLS-HELLO', 'UDP-CONNECT'], diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html index 60a2d44d..b4108e37 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html @@ -22,7 +22,7 @@

Protocol: - The protocol for which this pool and its members listen. A valid value is HTTP, HTTPS, PROXY, TCP or UDP. + The protocol for which this pool and its members listen. A valid value is HTTP, HTTPS, PROXY, PROXYV2, TCP or UDP.

diff --git a/releasenotes/notes/Add-ProxyV2-b5537c092737fe41.yaml b/releasenotes/notes/Add-ProxyV2-b5537c092737fe41.yaml new file mode 100644 index 00000000..4a2029cb --- /dev/null +++ b/releasenotes/notes/Add-ProxyV2-b5537c092737fe41.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Added Octavia dashboard support for proxy protocol version 2.