Merge "Add proxy protocol v2 support to dashboard"

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'],

octavia_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html

@@ -22,7 +22,7 @@
 <p>
   <strong translate>Protocol:</strong>
   <translate>
-  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.
   </translate>
 </p>
 <p>

releasenotes/notes/Add-ProxyV2-b5537c092737fe41.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Added Octavia dashboard support for proxy protocol version 2.