From bb48a1ab14480c88a922ecd3687c5d194f6bb8e8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe.evrard@rackspace.co.uk>
Date: Thu, 17 Aug 2017 14:23:28 +0000
Subject: [PATCH] Fix Barbican's health checks

HAProxy healthchecks for Barbican are currently testing by sending
a HEAD request method, where it should be only using a GET.
The GET method only should test the /, because /healthcheck
was not implemented into barbican [1].

The expected result should be in 2xx/3xx range, which doesn't
require any special config in haproxy.

[1] See spec for /healthcheck
https://review.openstack.org/#/c/207317/5/specs/mitaka/healthcheck-endpoint.rst@117

Change-Id: I221ff0ad68de77d72a9c45db969ce2084a005774
Closes-Bug: 1702962
---
 group_vars/all/haproxy.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/group_vars/all/haproxy.yml b/group_vars/all/haproxy.yml
index 2b3d7c4ade..1cc446e5b3 100644
--- a/group_vars/all/haproxy.yml
+++ b/group_vars/all/haproxy.yml
@@ -254,9 +254,7 @@ haproxy_default_services:
       haproxy_port: 9311
       haproxy_balance_type: http
       haproxy_backend_options:
-        - "httpchk HEAD /"
-      haproxy_backend_httpcheck_options:
-        - "expect status 401"
+        - "httpchk GET /"
   - service:
       haproxy_service_name: designate_api
       haproxy_backend_nodes: "{{ groups['designate_api'] | default([]) }}"