summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-03 08:47:05 +0000
committerGerrit Code Review <review@openstack.org>2016-11-03 08:47:05 +0000
commitde24d7bf248e16e758a7c0edef558d466d0113af (patch)
tree59d27902b3a9735fe5084de50b88a8d5033a9ed0
parent44d3ebe54661df0fcea30969f495f9780ee7c671 (diff)
parentaa82e175b5276729385f9b938f34a291b98640f5 (diff)
Merge "Make sure keepalived is restarted before haproxy."
-rw-r--r--manifests/keepalived.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/manifests/keepalived.pp b/manifests/keepalived.pp
index c0fb3ef..515dcd0 100644
--- a/manifests/keepalived.pp
+++ b/manifests/keepalived.pp
@@ -158,5 +158,8 @@ class tripleo::keepalived (
priority => 101,
}
}
-
+ # Make sure keepalive starts before haproxy.
+ if (defined(Class['::haproxy'])) {
+ Class['::keepalived::service'] -> Class['::haproxy']
+ }
}