opendev
/
puppet-cgit
Code Issues Proposed changes

Merge "Filter out link-local ipv6 address in loadbalancer"

This commit is contained in:
Zuul 2018-10-16 19:44:40 +00:00 committed by Gerrit Code Review
parent 8f321d3283 7fe0c1eaee
commit e9b3c8f2d9
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/lb.pp
View File

@ -81,8 +81,18 @@ class cgit::lb (
defaults_options => $defaults_options,
}
# NOTE(cmurphy) If the only available ipv6 address is a link-local address,
# facter won't filter it out:
# https://docs.puppet.com/facter/3.1/release_notes.html#regression-fix-avoid-reporting-link-local-ipv6-addresses-if-a-valid-address-is-available
# But we don't want haproxy to try to bind to a link local address, so filter
# it out
if $::ipaddress6 =~ /^fe[89a-f]/ {
$_ipaddress6 = undef
} else {
$_ipaddress6 = $::ipaddress6
}
# The three listen defines here are what the world will hit.
$haproxy_addresses = delete_undef_values([$::ipaddress, $::ipaddress6])
$haproxy_addresses = delete_undef_values([$::ipaddress, $_ipaddress6])
haproxy::listen { 'balance_git_http':
ipaddress => $haproxy_addresses,