summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-11-17 17:37:45 +0000
committerSteven Hardy <shardy@redhat.com>2016-11-17 17:37:45 +0000
commit92f9c952d6cbb0c11c8457de0e49748f3adf667e (patch)
tree28536eb54a5ded8df99e6fdc145c2371201657f1 /manifests
parentb8dfe7fb4b588d39634cbf36a6ffaf6516a12ee0 (diff)
Replace hard-coded haproxy/keepalived coupling
We have a variable in hiera which tells us if the keepalived service is enabled, so use it here. Without this any deployment disabling OS::TripleO::Services::Keepalived will fail. Change-Id: I90faf51881bd05920067c1e1d82baf5d7586af23 Closes-Bug: #1642677
Diffstat (limited to 'manifests')
-rw-r--r--manifests/haproxy.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 2cd69c5..6f68562 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -21,7 +21,7 @@
#
# [*keepalived*]
# Whether to configure keepalived to manage the VIPs or not.
-# Defaults to true
+# Defaults to hiera('keepalived_enabled')
#
# [*haproxy_service_manage*]
# Will be passed as value for service_manage to HAProxy module.
@@ -449,7 +449,7 @@
class tripleo::haproxy (
$controller_virtual_ip,
$public_virtual_ip,
- $keepalived = true,
+ $keepalived = hiera('keepalived_enabled', false),
$haproxy_service_manage = true,
$haproxy_global_maxconn = 20480,
$haproxy_default_maxconn = 4096,
@@ -606,7 +606,7 @@ class tripleo::haproxy (
}
# This code will be removed once we switch undercloud and overcloud to use both haproxy & keepalived roles.
- if $keepalived {
+ if str2bool($keepalived) {
include ::tripleo::keepalived
# Make sure keepalive starts before haproxy.
Class['::keepalived::service'] -> Class['::haproxy']