diff options
| -rw-r--r-- | manifests/haproxy.pp | 2 | ||||
| -rw-r--r-- | manifests/keepalived.pp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 7c5ff39..2ca7a06 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -599,6 +599,8 @@ class tripleo::haproxy ( # This code will be removed once we switch undercloud and overcloud to use both haproxy & keepalived roles. if $keepalived { include ::tripleo::keepalived + # Make sure keepalive starts before haproxy. + Class['::keepalived::service'] -> Class['::haproxy'] } # TODO(bnemec): When we have support for SSL on private and admin endpoints, diff --git a/manifests/keepalived.pp b/manifests/keepalived.pp index 515dcd0..0e9262d 100644 --- a/manifests/keepalived.pp +++ b/manifests/keepalived.pp @@ -158,8 +158,4 @@ class tripleo::keepalived ( priority => 101, } } - # Make sure keepalive starts before haproxy. - if (defined(Class['::haproxy'])) { - Class['::keepalived::service'] -> Class['::haproxy'] - } } |