openstack/puppet-tripleo
Code Issues Proposed changes

Only restart haproxy services when enable_load_balancer is defined

Browse Source 
If we upgrade a cloud that was configured with external load balancer
the process will fail during convergence step because it will try to
restart haproxy which is not configured when an external load balancer
is configured.

Closes-Bug: #1636527

Change-Id: I6f6caec3e5c96e77437c1c83e625f39649a66c48
This commit is contained in:
Michele Baldessari 2016-10-25 14:36:56 +02:00
parent 0b9c8fb56a
commit cf4166ff5d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/pacemaker/haproxy.pp
View File

@ -44,7 +44,7 @@ class tripleo::profile::pacemaker::haproxy (
$pacemaker_master = false
}
if $step >= 1 and $pacemaker_master and hiera('stack_action') == 'UPDATE' {
if $step >= 1 and $pacemaker_master and hiera('stack_action') == 'UPDATE' and $enable_load_balancer {
tripleo::pacemaker::resource_restart_flag { 'haproxy-clone':
subscribe => Concat['/etc/haproxy/haproxy.cfg'],
}