opendev
/
puppet-cgit
Code Issues Proposed changes

Do not send not existing values to haproxy 

If facter is not providing values for ipaddress or
ipaddress6, it's causing rules with undef content
to be created into haproxy.cfg
So check if these settings have a defined value
before adding that to the manifest.

Change-Id: I18256fe5aaf71626ea458a0a3d949f8adea5d72c
This commit is contained in:
Yolanda Robla 2015-08-14 13:23:55 +02:00
parent ddb501e501
commit e9c8674989
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/lb.pp
View File

@ -49,8 +49,10 @@ class cgit::lb (
},
}
# The three listen defines here are what the world will hit.
$haproxy_addresses = delete_undef_values([$::ipaddress, $::ipaddress6])
haproxy::listen { 'balance_git_http':
ipaddress => [$::ipaddress, $::ipaddress6],
ipaddress => $haproxy_addresses,
ports => ['80'],
mode => 'tcp',
collect_exported => false,
@ -62,7 +64,7 @@ class cgit::lb (
},
}
haproxy::listen { 'balance_git_https':
ipaddress => [$::ipaddress, $::ipaddress6],
ipaddress => $haproxy_addresses,
ports => ['443'],
mode => 'tcp',
collect_exported => false,
@ -74,7 +76,7 @@ class cgit::lb (
},
}
haproxy::listen { 'balance_git_daemon':
ipaddress => [$::ipaddress, $::ipaddress6],
ipaddress => $haproxy_addresses,
ports => ['9418'],
mode => 'tcp',
collect_exported => false,