diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-21 23:58:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-21 23:58:42 +0000 |
| commit | 7e623480c475ddf95bc874ed8a3f17000deacbee (patch) | |
| tree | 9a4eb68d73dbca7a2513239f3fea16abc12a0313 /manifests/haproxy.pp | |
| parent | 3df8e5e3395c3f984e10457e7a95f9a669fbf0d7 (diff) | |
| parent | 87763459ae57614e092f772595a03e7d552f96d1 (diff) | |
Merge "Adds auto-detection for VIP interfaces"
Diffstat (limited to 'manifests/haproxy.pp')
| -rw-r--r-- | manifests/haproxy.pp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 5b4d05e..397f563 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -19,10 +19,6 @@ # # === Parameters: # -# [*keepalived*] -# Whether to configure keepalived to manage the VIPs or not. -# Defaults to hiera('keepalived_enabled') -# # [*haproxy_service_manage*] # Will be passed as value for service_manage to HAProxy module. # Defaults to true @@ -459,7 +455,6 @@ class tripleo::haproxy ( $controller_virtual_ip, $public_virtual_ip, - $keepalived = hiera('keepalived_enabled', false), $haproxy_service_manage = true, $haproxy_global_maxconn = 20480, $haproxy_default_maxconn = 4096, @@ -619,13 +614,6 @@ class tripleo::haproxy ( $controller_hosts_names_real = downcase(any2array(split($controller_hosts_names, ','))) } - # This code will be removed once we switch undercloud and overcloud to use both haproxy & keepalived roles. - if str2bool($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, # have the haproxy stats endpoint use that certificate by default. if $haproxy_stats_certificate { |