stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #455 from enovance/haproxy-notify

Browse Source 
loadbalancer: revert service_manage for haproxy
This commit is contained in:
Yanis Guenane
2014-05-05 10:14:10 -04:00
parent c8c1eb1951 9cf09c6e6e
commit 616fbaa5c8
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/loadbalancer.pp
View File

@@ -233,13 +233,7 @@ class cloud::loadbalancer(
# Ensure Keepalived is started before HAproxy to avoid binding errors. # Ensure Keepalived is started before HAproxy to avoid binding errors.
class { 'keepalived': } -> class { 'keepalived': } ->
class { 'haproxy': class { 'haproxy':
service_manage => false service_manage => true
}
# Still allow HAproxy to start
if ($::osfamily == 'Debian') {
file { '/etc/default/haproxy':
content => 'ENABLED=1'
}
} }
keepalived::vrrp_script { 'haproxy': keepalived::vrrp_script { 'haproxy':

4
spec/classes/cloud_loadbalancer_spec.rb
View File

@@ -124,7 +124,7 @@ describe 'cloud::loadbalancer' do
}) })
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
should contain_class('haproxy').with(:service_manage => false) should contain_class('haproxy').with(:service_manage => true)
end # configure haproxy server end # configure haproxy server
end # configure keepalived in backup end # configure keepalived in backup
@@ -143,7 +143,7 @@ describe 'cloud::loadbalancer' do
}) })
end end
it 'configure haproxy server with service managed' do it 'configure haproxy server with service managed' do
should contain_class('haproxy').with(:service_manage => false) should contain_class('haproxy').with(:service_manage => true)
end # configure haproxy server end # configure haproxy server
end # configure keepalived in master end # configure keepalived in master