stackforge/puppet-openstack-cloud
Code Issues Proposed changes

loadbalancer: clean define, (refs: #4541)

Browse Source
This commit is contained in:
Sebastien Badia 2013-12-30 12:45:36 +01:00
parent 6a196dde7e
commit 79ca73c9fc
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/loadbalancer.pp
View File

@ -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 }

9
manifests/loadbalancer/listen_http.pp
View File

@ -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',