stackforge/puppet-openstack-cloud
Code Issues Proposed changes

lb/bind: cleaner array merging

Browse Source
This commit is contained in:
François Charlier
2014-05-05 11:13:17 +02:00
parent ae4a05e8ef
commit 38282a813f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/loadbalancer/binding.pp
View File

@@ -26,18 +26,17 @@ define cloud::loadbalancer::binding (
$vip_public_ip_array = any2array($::cloud::loadbalancer::vip_public_ip)
$vip_internal_ip_array = any2array($::cloud::loadbalancer::vip_internal_ip)
if $::cloud::loadbalancer::vip_public_ip and $::cloud::loadbalancer::vip_internal_ip {
$all_vip = join([$vip_public_ip_array,$vip_internal_ip_array], ',')
$all_vip_array = union($vip_public_ip_array, $vip_internal_ip_array)
}
if $::cloud::loadbalancer::vip_public_ip and ! $::cloud::loadbalancer::vip_internal_ip {
$all_vip = join($vip_public_ip_array, ',')
$all_vip_array = $vip_public_ip_array
}
if ! $::cloud::loadbalancer::vip_public_ip and $::cloud::loadbalancer::vip_internal_ip {
$all_vip = join($vip_internal_ip_array, ',')
$all_vip_array = $vip_internal_ip_array
}
if ! $::cloud::loadbalancer::vip_internal_ip and ! $::cloud::loadbalancer::vip_public_ip {
fail('vip_public_ip and vip_internal_ip are both set to false, no binding is possible.')
}
$all_vip_array = split($all_vip, ',')
# when we do not want binding
if ($ip == false) {