opendev/puppet-cgit
Code Issues Proposed changes

Merge "Do not send not existing values to haproxy"

Browse Source
This commit is contained in:
Jenkins
2015-09-14 16:54:05 +00:00
committed by Gerrit Code Review
parent dc7e58943d e9c8674989
commit 3e5cc48a3a
1 changed files with 5 additions and 3 deletions
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. # The three listen defines here are what the world will hit.
$haproxy_addresses = delete_undef_values([$::ipaddress, $::ipaddress6])
haproxy::listen { 'balance_git_http': haproxy::listen { 'balance_git_http':
ipaddress => [$::ipaddress, $::ipaddress6], ipaddress => $haproxy_addresses,
ports => ['80'], ports => ['80'],
mode => 'tcp', mode => 'tcp',
collect_exported => false, collect_exported => false,
@@ -62,7 +64,7 @@ class cgit::lb (
}, },
} }
haproxy::listen { 'balance_git_https': haproxy::listen { 'balance_git_https':
ipaddress => [$::ipaddress, $::ipaddress6], ipaddress => $haproxy_addresses,
ports => ['443'], ports => ['443'],
mode => 'tcp', mode => 'tcp',
collect_exported => false, collect_exported => false,
@@ -74,7 +76,7 @@ class cgit::lb (
}, },
} }
haproxy::listen { 'balance_git_daemon': haproxy::listen { 'balance_git_daemon':
ipaddress => [$::ipaddress, $::ipaddress6], ipaddress => $haproxy_addresses,
ports => ['9418'], ports => ['9418'],
mode => 'tcp', mode => 'tcp',
collect_exported => false, collect_exported => false,