diff options
Diffstat (limited to 'manifests/haproxy.pp')
| -rw-r--r-- | manifests/haproxy.pp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index c0084be..5b4d05e 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. @@ -459,7 +459,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, @@ -620,7 +620,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'] @@ -823,6 +823,7 @@ class tripleo::haproxy ( }, public_ssl_port => $ports[cinder_api_ssl_port], service_network => $cinder_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } @@ -1001,9 +1002,10 @@ class tripleo::haproxy ( internal_ip => hiera('barbican_api_vip', $controller_virtual_ip), service_port => $ports[barbican_api_port], ip_addresses => hiera('barbican_api_node_ips', $controller_hosts_real), - server_names => hiera('aodh_api_node_names', $controller_hosts_names_real), + server_names => hiera('barbican_api_node_names', $controller_hosts_names_real), public_ssl_port => $ports[barbican_api_ssl_port], - service_network => $barbican_network + service_network => $barbican_network, + member_options => union($haproxy_member_options, $internal_tls_member_options), } } |