openstack/charm-keystone
Code Issues Proposed changes

Revert "Enable health check httpchk options in haproxy."

Browse Source 
This reverts commit 579daa68203fe9e5387ca122d2ea72f9c2182ac0.

Reason for revert: This change breaks Keystone with TLS enabled

Change-Id: I20d3a476ef6f9ae1ae0bd4a5254e57f27a4d5917
This commit is contained in:
Frode Nordahl 2021-08-16 07:19:31 +00:00
parent 579daa6820
commit 3143cb6638
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hooks/keystone_context.py
View File

@ -163,20 +163,6 @@ class HAProxyContext(context.HAProxyContext):
api_port('keystone-public'), a_public_port], api_port('keystone-public'), a_public_port],
} }
# use httpchk to ensure the keystone backend is healthy
backend_options = {
'admin-port': [
{'option': 'httpchk GET /v3'},
{'http-check': 'expect string stable'}
],
'public-port': [
{'option': 'httpchk GET /v3'},
{'http-check': 'expect string stable'}
]
}
# for haproxy.conf
ctxt['backend_options'] = backend_options
# for haproxy.conf # for haproxy.conf
ctxt['service_ports'] = port_mapping ctxt['service_ports'] = port_mapping
# for keystone.conf # for keystone.conf

10
unit_tests/test_keystone_contexts.py
View File

@ -135,16 +135,6 @@ class TestKeystoneContexts(CharmTestCase):
'admin-port': ['12', '34'], 'admin-port': ['12', '34'],
'public-port': ['12', '34'] 'public-port': ['12', '34']
}, },
'backend_options': {
'admin-port': [
{'option': 'httpchk GET /v3'},
{'http-check': 'expect string stable'}
],
'public-port': [
{'option': 'httpchk GET /v3'},
{'http-check': 'expect string stable'}
]
},
'default_backend': '1.2.3.4', 'default_backend': '1.2.3.4',
'frontends': { 'frontends': {
'1.2.3.4': { '1.2.3.4': {