From 79ca73c9fcade0dde0fb27d84cfac9601c186167 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Mon, 30 Dec 2013 12:45:36 +0100 Subject: [PATCH] loadbalancer: clean define, (refs: #4541) --- manifests/loadbalancer.pp | 2 +- manifests/loadbalancer/listen_http.pp | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 818dd3d8..414bca31 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -178,7 +178,7 @@ monitor fail if horizon_dead privatecloud::loadbalancer::listen_http{ 'metadata_api_cluster': ports => $ks_metadata_public_port } } if $spice { - privatecloud::loadbalancer::listen_http{ 'spice_cluster': ports => $spice_port } + privatecloud::loadbalancer::listen_http{ 'spice_cluster': ports => $spice_port, httpchk => 'httpchk GET /' } } if $glance_api { privatecloud::loadbalancer::listen_http{ 'spice_cluster': ports => $ks_glance_public_port } diff --git a/manifests/loadbalancer/listen_http.pp b/manifests/loadbalancer/listen_http.pp index 714b7c54..b4932a90 100644 --- a/manifests/loadbalancer/listen_http.pp +++ b/manifests/loadbalancer/listen_http.pp @@ -17,12 +17,9 @@ # # privatecloud::loadbalancer::listen_http # -define privatecloud::loadbalancer::listen_http( $ports = 'unset' ) { - if $name == '6082' { # spice doesn't support OPTIONS - $httpchk = 'httpchk GET /' - } else { - $httpchk = 'httpchk' - } +define privatecloud::loadbalancer::listen_http( + $ports = 'unset', + $httpchk = 'httpchk') { haproxy::listen { $name: ipaddress => '0.0.0.0',