openstack
/
puppet-tripleo
Code Issues Proposed changes

Ensure haproxy::balancemember::ports is a string 

The recent change[1] in puppetlabs-haproxy introduced data type check
and now the ports parameter accept only string or array of strings and
no longer accepts an integer.

This ensures the value is converted to avoid validation errors.

[1] 95ca912f77

Closes-Bug: #2003882
Change-Id: I65720576249f2242331e38762dd0d5860d74de9d
This commit is contained in:
Takashi Kajinami 2023-01-26 01:45:56 +09:00
parent 0ab70ac702
commit 5641c0d3aa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/haproxy/endpoint.pp
View File

@ -254,7 +254,7 @@ define tripleo::haproxy::endpoint (
$non_colon_ip = regsubst($ip, ':', '-', 'G')
haproxy::balancermember { "${name}_${non_colon_ip}_${server}":
listening_service => $name,
ports => $service_port_real,
ports => "${service_port_real}",
ipaddresses => $ip,
server_names => $server,
options => union($member_options, ["cookie ${server}"]),
@ -263,7 +263,7 @@ define tripleo::haproxy::endpoint (
} else {
haproxy::balancermember { "${name}":
listening_service => $name,
ports => $service_port_real,
ports => "${service_port_real}",
ipaddresses => $ip_addresses_real,
server_names => $server_names_real,
options => $member_options,

2
manifests/haproxy/horizon_endpoint.pp
View File

@ -160,7 +160,7 @@ class tripleo::haproxy::horizon_endpoint (
$non_colon_ip = regsubst($ip, ':', '-', 'G')
haproxy::balancermember { "horizon_${non_colon_ip}_${server}":
listening_service => 'horizon',
ports => $backend_port,
ports => "${$backend_port}",
ipaddresses => $ip,
server_names => $server,
options => union($member_options, ["cookie ${server}"]),