diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-05-31 08:54:36 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-06-02 22:23:07 -0400 |
| commit | ca2efb57616ec88b6028e2921c4f18e8a0b4ec14 (patch) | |
| tree | c0bf4fffc62b9551ac0821299a549b1077fcc48a /manifests/haproxy.pp | |
| parent | 4529b60bdebb6168c08b1d46873287dc7770981a (diff) | |
Remove tripleo::loadbalancer
The split has been done on both undercloud & overcloud, they now use
tripleo::haproxy and tripleo::keepalived. We can move forward with
removing tripleo::loadbalancer and tripleo::loadbalancer::endpoint, not
used anymore.
Simplify tripleo::profile::base::loadbalancer to just include
tripleo::haproxy and rely on Hiera for parameters.
Change-Id: Ieeb1e94117ae9cb8b11320306de3a9b236bd989a
Diffstat (limited to 'manifests/haproxy.pp')
| -rw-r--r-- | manifests/haproxy.pp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index dc6fb94..e3e48ce 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -54,13 +54,14 @@ # Defaults to '/dev/log' # # [*controller_hosts*] -# (Required) IPs of host or group of hosts to load-balance the services +# IPs of host or group of hosts to load-balance the services # Can be a string or an array. +# Defaults tohiera('controller_node_ips') # # [*controller_hosts_names*] # Names of host or group of hosts to load-balance the services # Can be a string or an array. -# Defaults to undef +# Defaults to hiera('controller_node_names', undef) # # [*controller_virtual_ip*] # Control IP or group of IPs to bind the pools @@ -263,7 +264,6 @@ class tripleo::haproxy ( $controller_virtual_ip, $public_virtual_ip, - $controller_hosts, $keepalived = true, $haproxy_service_manage = true, $haproxy_global_maxconn = 20480, @@ -274,7 +274,8 @@ class tripleo::haproxy ( $haproxy_log_address = '/dev/log', $haproxy_stats_user = 'admin', $haproxy_stats_password = undef, - $controller_hosts_names = undef, + $controller_hosts = hiera('controller_node_ips'), + $controller_hosts_names = hiera('controller_node_names', undef), $service_certificate = undef, $internal_certificate = undef, $ssl_cipher_suite = '!SSLv2:kEECDH:kRSA:kEDH:kPSK:+3DES:!aNULL:!eNULL:!MD5:!EXP:!RC4:!SEED:!IDEA:!DES', @@ -351,11 +352,11 @@ class tripleo::haproxy ( } $ports = merge($default_service_ports, $service_ports) - $controller_hosts_real = any2array($controller_hosts) - if !$controller_hosts_names { + $controller_hosts_real = any2array(split($controller_hosts, ',')) + if ! $controller_hosts_names { $controller_hosts_names_real = $controller_hosts_real } else { - $controller_hosts_names_real = any2array($controller_hosts_names) + $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. |