diff --git a/hooks/keystone_context.py b/hooks/keystone_context.py index 35615b9a..ddbf4568 100644 --- a/hooks/keystone_context.py +++ b/hooks/keystone_context.py @@ -163,20 +163,6 @@ class HAProxyContext(context.HAProxyContext): 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 ctxt['service_ports'] = port_mapping # for keystone.conf diff --git a/unit_tests/test_keystone_contexts.py b/unit_tests/test_keystone_contexts.py index 4584bbf8..8a75cd4a 100644 --- a/unit_tests/test_keystone_contexts.py +++ b/unit_tests/test_keystone_contexts.py @@ -135,16 +135,6 @@ class TestKeystoneContexts(CharmTestCase): 'admin-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', 'frontends': { '1.2.3.4': {