From 727d1b006a619b3639bee3557942d15329286839 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 25 May 2016 15:51:39 -0400 Subject: loadbalancer: make sure controller_* are array-typed Make sure controller_hosts_real and controller_hosts_names_real become array-types anyway, so we don't need to add brackets in Hiera lookups (example on both undercloud & overcloud where we do [hiera('controller_host')]). Change-Id: I2fe899482acfd51919262bc7a6a1c9f450e173f4 --- manifests/loadbalancer.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 2926e49..ebac621 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -392,16 +392,16 @@ class tripleo::loadbalancer ( fail('$controller_hosts or $controller_host (now deprecated) is a mandatory parameter') } if $controller_hosts { - $controller_hosts_real = $controller_hosts + $controller_hosts_real = any2array($controller_hosts) } else { warning('$controller_host has been deprecated in favor of $controller_hosts') - $controller_hosts_real = $controller_host + $controller_hosts_real = any2array($controller_host) } if !$controller_hosts_names { - $controller_hosts_names_real = $controller_hosts_real + $controller_hosts_names_real = any2array($controller_hosts_real) } else { - $controller_hosts_names_real = $controller_hosts_names + $controller_hosts_names_real = any2array($controller_hosts_names) } if $manage_vip { -- cgit 1.2.3-korg