From 95b51a83cd41c71838bd4c99033f2cef042e980b Mon Sep 17 00:00:00 2001
From: Ramon Melero <rmelero@mirantis.com>
Date: Sun, 2 Apr 2017 03:29:34 -0500
Subject: [PATCH] Implement http-check on haproxy services

Some services were setup using only tcp checks. This change fixes endpoints
that can now use the http-check by checking against the correct status codes.

Change-Id: I6d1a96aa3847eac936993488130693a6137c8e35
---
 playbooks/vars/configs/haproxy_config.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/playbooks/vars/configs/haproxy_config.yml b/playbooks/vars/configs/haproxy_config.yml
index 7ed09d5f13..4d2de08253 100644
--- a/playbooks/vars/configs/haproxy_config.yml
+++ b/playbooks/vars/configs/haproxy_config.yml
@@ -155,12 +155,14 @@ haproxy_default_services:
       haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
       haproxy_ssl: "{{ haproxy_ssl }}"
       haproxy_port: "{{ nova_console_port }}"
-      haproxy_balance_type: tcp
+      haproxy_balance_type: http
       haproxy_timeout_client: 60m
       haproxy_timeout_server: 60m
       haproxy_balance_alg: source
       haproxy_backend_options:
-        - tcp-check
+        - "httpchk HEAD /"
+      haproxy_backend_httpcheck_options:
+        - "expect status 404"
   - service:
       haproxy_service_name: cinder_api
       haproxy_backend_nodes: "{{ groups['cinder_api'] | default([]) }}"
@@ -204,9 +206,11 @@ haproxy_default_services:
       haproxy_backend_nodes: "{{ groups['aodh_api'] | default([]) }}"
       haproxy_ssl: "{{ haproxy_ssl }}"
       haproxy_port: 8042
-      haproxy_balance_type: tcp
+      haproxy_balance_type: http
       haproxy_backend_options:
-        - tcp-check
+        - "httpchk HEAD /"
+      haproxy_backend_httpcheck_options:
+        - "expect status 401"
   - service:
       haproxy_service_name: ironic_api
       haproxy_backend_nodes: "{{ groups['ironic_api'] | default([]) }}"
@@ -245,9 +249,11 @@ haproxy_default_services:
       haproxy_backend_nodes: "{{ groups['barbican_api'] | default([]) }}"
       haproxy_ssl: "{{ haproxy_ssl }}"
       haproxy_port: 9311
-      haproxy_balance_type: tcp
+      haproxy_balance_type: http
       haproxy_backend_options:
-        - tcp-check
+        - "httpchk HEAD /"
+      haproxy_backend_httpcheck_options:
+        - "expect status 401"
   - service:
       haproxy_service_name: designate_api
       haproxy_backend_nodes: "{{ groups['designate_api'] | default([]) }}"