aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorMichele Baldessari <michele@acksyn.org>2016-10-25 14:36:56 +0200
committerMichele Baldessari <michele@acksyn.org>2016-10-25 16:23:04 +0200
commitcf4166ff5defb90acd7ffa4d3df3dda606cbd1ec (patch)
tree70fdf41dcb17c7608321f337288a5fdc77c6a7a0 /manifests/profile
parent0b9c8fb56ae508aafca7219bfaff6e75afdfa9c2 (diff)
Only restart haproxy services when enable_load_balancer is defined
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
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/pacemaker/haproxy.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/profile/pacemaker/haproxy.pp b/manifests/profile/pacemaker/haproxy.pp
index 21d8ab1..605bb15 100644
--- a/manifests/profile/pacemaker/haproxy.pp
+++ b/manifests/profile/pacemaker/haproxy.pp
@@ -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'],
}