aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSofer Athlan-Guyot <sathlang@redhat.com>2016-10-31 15:53:13 +0100
committerSofer Athlan-Guyot <sathlang@redhat.com>2016-10-31 19:25:11 +0100
commitaa82e175b5276729385f9b938f34a291b98640f5 (patch)
tree0dc86539ea17cc42266d1307d3f79f29b5304352
parent9bda1ab55c13c4ee1b4e1031246ed61f861fcf9b (diff)
Make sure keepalived is restarted before haproxy.
When using SSL setup for undercloud, the admin and public vip required for ssl binding by haproxy are created by keepalived. This makes sure that keepalived is started before haproxy and thus that the interfaces are indeed present. This patch also ensures this is happening for overcloud ssl configuration. The case where another load-balancing technology other than haproxy is used is not covered. Closes-Bug: #1638029 Change-Id: I98cb0dcd7f389a1dd38ec8324429bfef4979aa66
-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']
+ }
}