stackforge/puppet-openstack-cloud
Code Issues Proposed changes

HAproxy: fix monitor template

Browse Source 
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>
This commit is contained in:
Emilien Macchi 2014-06-23 14:00:25 +02:00
parent 7d9925de66
commit 82b90e0120
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
templates/loadbalancer/monitor.erb
View File

@ -6,6 +6,10 @@ monitor fail if swift_api_dead
acl keystone_api_dead nbsrv(keystone_api_cluster) lt 1 acl keystone_api_dead nbsrv(keystone_api_cluster) lt 1
monitor fail if keystone_api_dead monitor fail if keystone_api_dead
<% end -%> <% 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 -%> <%- if @galera -%>
acl galera_dead nbsrv(galera_cluster) lt 1 acl galera_dead nbsrv(galera_cluster) lt 1
monitor fail if galera_dead 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 acl nova_api_dead nbsrv(nova_api_cluster) lt 1
monitor fail if nova_api_dead monitor fail if nova_api_dead
<%- end -%> <%- end -%>
<%- if @nova_ec2 -%> <%- if @ec2_api -%>
acl nova_ec2_dead nbsrv(nova_ec2_cluster) lt 1 acl ec2_api_dead nbsrv(ec2_api_cluster) lt 1
monitor fail if nova_ec2_dead monitor fail if ec2_api_dead
<%- end -%> <%- end -%>
<%- if @nova_metadata -%> <%- if @metadata_api -%>
acl nova_metadata_dead nbsrv(nova_metadata_cluster) lt 1 acl metadata_api_dead nbsrv(metadata_api_cluster) lt 1
monitor fail if nova_metadata_dead monitor fail if metadata_api_dead
<%- end -%> <%- end -%>
<%- if @spice -%> <%- if @spice -%>
acl spice_dead nbsrv(spice_cluster) lt 1 acl spice_dead nbsrv(spice_cluster) lt 1
monitor fail if spice_dead monitor fail if spice_dead
<%- end -%> <%- end -%>
<%- if @glance_api -%> <%- if @glance_api -%>
acl nova_api_dead nbsrv(glance_api_cluster) lt 1 acl glance_api_dead nbsrv(glance_api_cluster) lt 1
monitor fail if nova_api_dead 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 -%> <%- end -%>
<%- if @ceilometer_api -%> <%- if @ceilometer_api -%>
acl ceilometer_api_dead nbsrv(ceilometer_api_cluster) lt 1 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 monitor fail if heat_api_dead
<%- end -%> <%- end -%>
<%- if @heat_cfn_api -%> <%- if @heat_cfn_api -%>
acl heat_api_cfn_dead nbsrv(heat_api_cfn_cluster) lt 1 acl heat_cfn_api_dead nbsrv(heat_cfn_api_cluster) lt 1
monitor fail if heat_api_cfn_dead monitor fail if heat_cfn_api_dead
<%- end -%> <%- end -%>
<%- if @heat_cloudwatch_api -%> <%- if @heat_cloudwatch_api -%>
acl heat_api_cloudwatch_dead nbsrv(heat_api_cloudwatch_cluster) lt 1 acl heat_cloudwatch_api_dead nbsrv(heat_cloudwatch_api_cluster) lt 1
monitor fail if heat_api_cloudwatch_dead monitor fail if heat_cloudwatch_api_dead
<%- end -%> <%- end -%>
<%- if @horizon -%> <%- if @horizon -%>
acl horizon_dead nbsrv(horizon_cluster) lt 1 acl horizon_dead nbsrv(horizon_cluster) lt 1