From 38282a813f69543b99aadfe3ba2caac0a4251f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= Date: Mon, 5 May 2014 11:13:17 +0200 Subject: [PATCH] lb/bind: cleaner array merging --- manifests/loadbalancer/binding.pp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/loadbalancer/binding.pp b/manifests/loadbalancer/binding.pp index 7f3308b9..74a15903 100644 --- a/manifests/loadbalancer/binding.pp +++ b/manifests/loadbalancer/binding.pp @@ -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) {