stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #679 from enovance/sbadia/fix/675

Browse Source 
(maint) Move specific distro params to cloud::params class
This commit is contained in:
Emilien Macchi 2014-10-11 17:51:04 -04:00
commit 994b6d430f
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
manifests/loadbalancer.pp
View File

@ -183,6 +183,7 @@
# (optional) Array or string for internal VIP # (optional) Array or string for internal VIP
# Should be part of keepalived_internal_ips # Should be part of keepalived_internal_ips
# Defaults to false (backward compatibility) # Defaults to false (backward compatibility)
#
class cloud::loadbalancer( class cloud::loadbalancer(
$swift_api = true, $swift_api = true,
$ceilometer_api = true, $ceilometer_api = true,
@ -261,21 +262,7 @@ class cloud::loadbalancer(
$keepalived_ipvs = false, $keepalived_ipvs = false,
){ ){
case $::osfamily { include cloud::params
'RedHat': {
# Specific to Red Hat
$start_haproxy_service = '"/usr/bin/systemctl start haproxy"'
$stop_haproxy_service = '"/usr/bin/systemctl stop haproxy"'
} # RedHat
'Debian': {
# Specific to Debian / Ubuntu
$start_haproxy_service = '"/etc/init.d/haproxy start"'
$stop_haproxy_service = '"/etc/init.d/haproxy stop"'
} # Debian
default: {
err "${::osfamily} not supported yet"
}
}
# Manage deprecation when using old parameters # Manage deprecation when using old parameters
if $keepalived_interface { if $keepalived_interface {
@ -326,8 +313,8 @@ class cloud::loadbalancer(
priority => $keepalived_priority, priority => $keepalived_priority,
auth_type => $keepalived_auth_type, auth_type => $keepalived_auth_type,
auth_pass => $keepalived_auth_pass, auth_pass => $keepalived_auth_pass,
notify_master => $start_haproxy_service, notify_master => $::cloud::params::start_haproxy_service,
notify_backup => $stop_haproxy_service, notify_backup => $::cloud::params::stop_haproxy_service,
} }
if !empty($keepalived_internal_ipvs) { if !empty($keepalived_internal_ipvs) {
@ -344,8 +331,8 @@ class cloud::loadbalancer(
priority => $keepalived_priority, priority => $keepalived_priority,
auth_type => $keepalived_auth_type, auth_type => $keepalived_auth_type,
auth_pass => $keepalived_auth_pass, auth_pass => $keepalived_auth_pass,
notify_master => $start_haproxy_service, notify_master => $::cloud::params::start_haproxy_service,
notify_backup => $stop_haproxy_service, notify_backup => $::cloud::params::stop_haproxy_service,
} }
} }
@ -496,12 +483,6 @@ class cloud::loadbalancer(
options => $heat_cloudwatch_options options => $heat_cloudwatch_options
} }
if $::osfamily == 'RedHat' {
$horizon_auth_url = 'dashboard'
} else {
$horizon_auth_url = 'horizon'
}
$horizon_ssl_options = { $horizon_ssl_options = {
'mode' => 'tcp', 'mode' => 'tcp',
'cookie' => 'sessionid prefix', 'cookie' => 'sessionid prefix',
@ -524,7 +505,7 @@ class cloud::loadbalancer(
cloud::loadbalancer::binding { 'horizon_cluster': cloud::loadbalancer::binding { 'horizon_cluster':
ip => $horizon, ip => $horizon,
port => $horizon_port, port => $horizon_port,
httpchk => "httpchk GET /${horizon_auth_url} \"HTTP/1.0\\r\\nUser-Agent: HAproxy-${::hostname}\"", httpchk => "httpchk GET /${::cloud::params::horizon_auth_url} \"HTTP/1.0\\r\\nUser-Agent: HAproxy-${::hostname}\"",
options => $horizon_options, options => $horizon_options,
bind_options => $horizon_bind_options, bind_options => $horizon_bind_options,
} }

17
manifests/params.pp
View File

@ -36,4 +36,21 @@ class cloud::params {
} }
} }
case $::osfamily {
'RedHat': {
# Specific to Red Hat
$start_haproxy_service = '"/usr/bin/systemctl start haproxy"'
$stop_haproxy_service = '"/usr/bin/systemctl stop haproxy"'
$horizon_auth_url = 'dashboard'
} # RedHat
'Debian': {
# Specific to Debian / Ubuntu
$start_haproxy_service = '"/etc/init.d/haproxy start"'
$stop_haproxy_service = '"/etc/init.d/haproxy stop"'
$horizon_auth_url = 'horizon'
} # Debian
default: {
fail("Unsupported osfamily (${::osfamily})")
}
}
} }