openstack
/
octavia
Code Issues Proposed changes

Merge "Add HTTP/2 to default lists of ALPN protocols"

This commit is contained in:
Zuul 2021-03-05 18:51:26 +00:00 committed by Gerrit Code Review
parent fbfa1e30ec dd3edb635b
commit 8d72f571e1
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/octavia.conf
View File

@ -86,11 +86,11 @@
# List of default ALPN protocols to be used on new TLS-terminated
# listeners. Available protocols: http/1.0, http/1.1, h2
# default_listener_alpn_protocols = http/1.1, http/1.0
# default_listener_alpn_protocols = h2, http/1.1, http/1.0
# List of default ALPN protocols to be used on new TLS-terminated
# pools. Available protocols: http/1.0, http/1.1, h2
# default_pool_alpn_protocols = http/1.1, http/1.0
# default_pool_alpn_protocols = h2, http/1.1, http/1.0
[database]

6
octavia/common/config.py
View File

@ -130,12 +130,14 @@ api_opts = [
choices=constants.TLS_ALL_VERSIONS + [None],
help=_('Minimum allowed TLS version for listeners and pools.')),
cfg.ListOpt('default_listener_alpn_protocols',
default=[lib_consts.ALPN_PROTOCOL_HTTP_1_1,
default=[lib_consts.ALPN_PROTOCOL_HTTP_2,
lib_consts.ALPN_PROTOCOL_HTTP_1_1,
lib_consts.ALPN_PROTOCOL_HTTP_1_0],
help=_('List of ALPN protocols to use for new TLS-enabled '
'listeners.')),
cfg.ListOpt('default_pool_alpn_protocols',
default=[lib_consts.ALPN_PROTOCOL_HTTP_1_1,
default=[lib_consts.ALPN_PROTOCOL_HTTP_2,
lib_consts.ALPN_PROTOCOL_HTTP_1_1,
lib_consts.ALPN_PROTOCOL_HTTP_1_0],
help=_('List of ALPN protocols to use for new TLS-enabled '
'pools.')),

3
octavia/tests/functional/api/v2/test_load_balancer.py
View File

@ -2794,7 +2794,8 @@ class TestLoadBalancerGraph(base.BaseAPITest):
expected_listener['tls_versions'] = (
constants.TLS_VERSIONS_OWASP_SUITE_B)
expected_listener['alpn_protocols'] = (
[lib_consts.ALPN_PROTOCOL_HTTP_1_1,
[lib_consts.ALPN_PROTOCOL_HTTP_2,
lib_consts.ALPN_PROTOCOL_HTTP_1_1,
lib_consts.ALPN_PROTOCOL_HTTP_1_0])
if create_timeout_client_data is not None:

5
releasenotes/notes/add-h2-alpn-protocol-to-default-e2d499d21a5d90d1.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The HTTP/2 protocol is now added to the default ALPN protocol list for
listener and pools.