openstack
/
puppet-tripleo
Code Issues Proposed changes

Use cell information for mysql and novncproxy haproxy proxies 

In case of a multicell deployment the mysql and nova novncproxy
backend servers need to use the SERVICE_cell_node_names.
Also the novncproxy did use the nova_api_vip and
nova_api_node_[ips|names] information insteand of
nova_vnc_proxy_vip and nova_vnc_proxy_node_[ips|names]

Change-Id: I606d1187a442c6ef6327a7503b6b5f0832cbb872
Related-Bug: #1822607
This commit is contained in:
Martin Schuppert 2019-04-02 11:50:23 +02:00
parent 1ae79f2a9a
commit bfc59e9382
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/haproxy.pp
View File

@ -1070,6 +1070,7 @@ class tripleo::haproxy (
}
}
$nova_vnc_proxy_vip = hiera('nova_vnc_proxy_vip', $controller_virtual_ip)
if $nova_novncproxy {
if $enable_internal_tls {
# we need to make sure we use ssl for checks.
@ -1079,12 +1080,17 @@ class tripleo::haproxy (
$haproxy_member_options_real = $haproxy_member_options
$novncproxy_ssl_member_options = []
}
if hiera('nova_is_additional_cell', undef) {
$novncproxy_server_names_real = hiera('nova_vnc_proxy_cell_node_names', $controller_hosts_names_real)
} else {
$novncproxy_server_names_real = hiera('nova_vnc_proxy_node_names', $controller_hosts_names_real)
}
::tripleo::haproxy::endpoint { 'nova_novncproxy':
public_virtual_ip => $public_virtual_ip,
internal_ip => $nova_api_vip,
internal_ip => $nova_vnc_proxy_vip,
service_port => $ports[nova_novnc_port],
ip_addresses => hiera('nova_api_node_ips', $controller_hosts_real),
server_names => hiera('nova_api_node_names', $controller_hosts_names_real),
ip_addresses => hiera('nova_vnc_proxy_node_ips', $controller_hosts_real),
server_names => $novncproxy_server_names_real,
listen_options => merge($default_listen_options, {
'option' => [ 'tcpka', 'tcplog' ],
'balance' => 'source',
@ -1343,6 +1349,11 @@ class tripleo::haproxy (
}
if $mysql {
if hiera('nova_is_additional_cell', undef) {
$mysql_server_names_real = hiera('mysql_cell_node_names', $controller_hosts_names_real)
} else {
$mysql_server_names_real = hiera('mysql_node_names', $controller_hosts_names_real)
}
haproxy::listen { 'mysql':
bind => $mysql_bind_opts,
options => $mysql_listen_options,
@ -1352,7 +1363,7 @@ class tripleo::haproxy (
listening_service => 'mysql',
ports => '3306',
ipaddresses => hiera('mysql_node_ips', $controller_hosts_real),
server_names => hiera('mysql_node_names', $controller_hosts_names_real),
server_names => $mysql_server_names_real,
options => $mysql_member_options_real,
}
if $manage_firewall {

7
releasenotes/notes/haproxy_cell_server_names-5cc0e81836d568b7.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
In case of a multicell deployment the mysql and nova novncproxy backend
servers need to use the SERVICE_cell_node_names.
Also the novncproxy did use the nova_api_vip and nova_api_node_[ips|names]
information insteand of nova_vnc_proxy_vip and nova_vnc_proxy_node_[ips|names]