From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Mon, 31 Oct 2016 14:53:13 +0000 (+0100)
Subject: Make sure keepalived is restarted before haproxy.
X-Git-Tag: opnfv-6.0.0~498^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=aa82e175b5276729385f9b938f34a291b98640f5;p=apex-puppet-tripleo.git

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
---

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']
+  }
 }