aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-09 13:26:32 +0000
committerGerrit Code Review <review@openstack.org>2016-11-09 13:26:32 +0000
commit7ce94fce7d18b1e814e5b5c399f8be8afb023b64 (patch)
tree288328081500260b6b5757cab5c9da0ab3e79793 /manifests
parent49e52544d2fc83002060567a40fe78b4fc514c6e (diff)
parentb11d048e55fc20a90bcf11eed0f4cea5e1b45f7c (diff)
Merge "Better way to ensure keepalived before haproxy."
Diffstat (limited to 'manifests')
-rw-r--r--manifests/haproxy.pp2
-rw-r--r--manifests/keepalived.pp4
2 files changed, 2 insertions, 4 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index aa95226..3fbd64e 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -608,6 +608,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']
- }
}