From 82b90e0120c06ffdbc6e57334b352fc0529384a3 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Mon, 23 Jun 2014 14:00:25 +0200
Subject: [PATCH] HAproxy: fix monitor template

Monitor template had some issues and was outdated.
This patch aims to update with new endpoints and have a correct service
monitor.

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 templates/loadbalancer/monitor.erb | 32 +++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/templates/loadbalancer/monitor.erb b/templates/loadbalancer/monitor.erb
index 49aa679a..537a24f8 100644
--- a/templates/loadbalancer/monitor.erb
+++ b/templates/loadbalancer/monitor.erb
@@ -6,6 +6,10 @@ monitor fail if swift_api_dead
 acl keystone_api_dead nbsrv(keystone_api_cluster) lt 1
 monitor fail if keystone_api_dead
 <% end -%>
+<%- if @keystone_api_admin -%>
+acl keystone_api_admin_dead nbsrv(keystone_api_admin_cluster) lt 1
+monitor fail if keystone_api_admin_dead
+<% end -%>
 <%- if @galera -%>
 acl galera_dead nbsrv(galera_cluster) lt 1
 monitor fail if galera_dead
@@ -22,21 +26,25 @@ monitor fail if cinder_api_dead
 acl nova_api_dead nbsrv(nova_api_cluster) lt 1
 monitor fail if nova_api_dead
 <%- end -%>
-<%- if @nova_ec2 -%>
-acl nova_ec2_dead nbsrv(nova_ec2_cluster) lt 1
-monitor fail if nova_ec2_dead
+<%- if @ec2_api -%>
+acl ec2_api_dead nbsrv(ec2_api_cluster) lt 1
+monitor fail if ec2_api_dead
 <%- end -%>
-<%- if @nova_metadata -%>
-acl nova_metadata_dead nbsrv(nova_metadata_cluster) lt 1
-monitor fail if nova_metadata_dead
+<%- if @metadata_api -%>
+acl metadata_api_dead nbsrv(metadata_api_cluster) lt 1
+monitor fail if metadata_api_dead
 <%- end -%>
 <%- if @spice -%>
 acl spice_dead nbsrv(spice_cluster) lt 1
 monitor fail if spice_dead
 <%- end -%>
 <%- if @glance_api -%>
-acl nova_api_dead nbsrv(glance_api_cluster) lt 1
-monitor fail if nova_api_dead
+acl glance_api_dead nbsrv(glance_api_cluster) lt 1
+monitor fail if glance_api_dead
+<%- end -%>
+<%- if @glance_registry -%>
+acl glance_registry_dead nbsrv(glance_registry_cluster) lt 1
+monitor fail if glance_registry_dead
 <%- end -%>
 <%- if @ceilometer_api -%>
 acl ceilometer_api_dead nbsrv(ceilometer_api_cluster) lt 1
@@ -47,12 +55,12 @@ acl heat_api_dead nbsrv(heat_api_cluster) lt 1
 monitor fail if heat_api_dead
 <%- end -%>
 <%- if @heat_cfn_api -%>
-acl heat_api_cfn_dead nbsrv(heat_api_cfn_cluster) lt 1
-monitor fail if heat_api_cfn_dead
+acl heat_cfn_api_dead nbsrv(heat_cfn_api_cluster) lt 1
+monitor fail if heat_cfn_api_dead
 <%- end -%>
 <%- if @heat_cloudwatch_api -%>
-acl heat_api_cloudwatch_dead nbsrv(heat_api_cloudwatch_cluster) lt 1
-monitor fail if heat_api_cloudwatch_dead
+acl heat_cloudwatch_api_dead nbsrv(heat_cloudwatch_api_cluster) lt 1
+monitor fail if heat_cloudwatch_api_dead
 <%- end -%>
 <%- if @horizon -%>
 acl horizon_dead nbsrv(horizon_cluster) lt 1