summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-26 13:33:25 +0000
committerGerrit Code Review <review@openstack.org>2016-10-26 13:33:25 +0000
commitabd4e6a227b83b80916bfdfb07ca2c6a7e7b215f (patch)
tree308c6ba02fc612a28053fed884679da5d66de9fa /manifests/profile
parent6da67bed0804541316a0fa105606668399cd81fc (diff)
parentcf4166ff5defb90acd7ffa4d3df3dda606cbd1ec (diff)
Merge "Only restart haproxy services when enable_load_balancer is defined"
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'],
}