stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge "lb: don't stop haproxy when becoming backup"

Browse Source
This commit is contained in:
Jenkins 2015-02-05 15:52:14 +00:00 committed by Gerrit Code Review
commit d3947a376f
3 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/loadbalancer.pp
View File

@ -535,7 +535,6 @@ class cloud::loadbalancer(
auth_type => $keepalived_auth_type, auth_type => $keepalived_auth_type,
auth_pass => $keepalived_auth_pass, auth_pass => $keepalived_auth_pass,
notify_master => $::cloud::params::start_haproxy_service, notify_master => $::cloud::params::start_haproxy_service,
notify_backup => $::cloud::params::stop_haproxy_service,
} }
@ -558,7 +557,6 @@ class cloud::loadbalancer(
auth_type => $keepalived_auth_type, auth_type => $keepalived_auth_type,
auth_pass => $keepalived_auth_pass, auth_pass => $keepalived_auth_pass,
notify_master => $::cloud::params::start_haproxy_service, notify_master => $::cloud::params::start_haproxy_service,
notify_backup => $::cloud::params::stop_haproxy_service,
} }
} }
} }

2
manifests/params.pp
View File

@ -42,7 +42,6 @@ class cloud::params {
'RedHat': { 'RedHat': {
# Specific to Red Hat # Specific to Red Hat
$start_haproxy_service = '"/usr/bin/systemctl start haproxy"' $start_haproxy_service = '"/usr/bin/systemctl start haproxy"'
$stop_haproxy_service = '"/usr/bin/systemctl stop haproxy"'
$horizon_auth_url = 'dashboard' $horizon_auth_url = 'dashboard'
$libvirt_service_name = 'libvirtd' $libvirt_service_name = 'libvirtd'
$keepalived_name_is_process = false $keepalived_name_is_process = false
@ -53,7 +52,6 @@ class cloud::params {
'Debian': { 'Debian': {
# Specific to Debian / Ubuntu # Specific to Debian / Ubuntu
$start_haproxy_service = '"/etc/init.d/haproxy start"' $start_haproxy_service = '"/etc/init.d/haproxy start"'
$stop_haproxy_service = '"/etc/init.d/haproxy stop"'
$horizon_auth_url = 'horizon' $horizon_auth_url = 'horizon'
$keepalived_name_is_process = true $keepalived_name_is_process = true
$keepalived_vrrp_script = undef $keepalived_vrrp_script = undef

4
spec/classes/cloud_loadbalancer_spec.rb
View File

@ -131,7 +131,6 @@ describe 'cloud::loadbalancer' do
'auth_type' => 'PASS', 'auth_type' => 'PASS',
'auth_pass' => 'secret', 'auth_pass' => 'secret',
'notify_master' => "#{platform_params[:start_haproxy_service]}", 'notify_master' => "#{platform_params[:start_haproxy_service]}",
'notify_backup' => "#{platform_params[:stop_haproxy_service]}",
}) })
end end
end end
@ -167,7 +166,6 @@ describe 'cloud::loadbalancer' do
'auth_type' => 'PASS', 'auth_type' => 'PASS',
'auth_pass' => 'secret', 'auth_pass' => 'secret',
'notify_master' => "#{platform_params[:start_haproxy_service]}", 'notify_master' => "#{platform_params[:start_haproxy_service]}",
'notify_backup' => "#{platform_params[:stop_haproxy_service]}",
}) })
end # configure vrrp_instance with BACKUP state end # configure vrrp_instance with BACKUP state
it 'configure haproxy server without service managed' do it 'configure haproxy server without service managed' do
@ -188,7 +186,6 @@ describe 'cloud::loadbalancer' do
'auth_type' => 'PASS', 'auth_type' => 'PASS',
'auth_pass' => 'secret', 'auth_pass' => 'secret',
'notify_master' => "#{platform_params[:start_haproxy_service]}", 'notify_master' => "#{platform_params[:start_haproxy_service]}",
'notify_backup' => "#{platform_params[:stop_haproxy_service]}",
}) })
end end
it 'configure haproxy server with service managed' do it 'configure haproxy server with service managed' do
@ -620,7 +617,6 @@ describe 'cloud::loadbalancer' do
let :platform_params do let :platform_params do
{ :auth_url => 'dashboard', { :auth_url => 'dashboard',
:start_haproxy_service => '"/usr/bin/systemctl start haproxy"', :start_haproxy_service => '"/usr/bin/systemctl start haproxy"',
:stop_haproxy_service => '"/usr/bin/systemctl stop haproxy"',
:keepalived_name_is_process => 'false', :keepalived_name_is_process => 'false',
:keepalived_vrrp_script => 'systemctl status haproxy.service', :keepalived_vrrp_script => 'systemctl status haproxy.service',
} }