From 73d64f2cc1742b855dc72dbc90f1d81cb6543413 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 5 Mar 2020 17:09:39 +0100 Subject: [PATCH] Force cast bridge mappings as an array In some cases, the parameter will not passed as an array but as a string, causing conversion error when generating the matching list Force array parameter conversion to cover all cases Change-Id: I4290bb1dbb96ea0d57e6ad8c6a686c2bf103c907 Closes-Bug: #1866206 --- manifests/agents/ml2/linuxbridge.pp | 2 +- manifests/agents/ml2/ovs.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/agents/ml2/linuxbridge.pp b/manifests/agents/ml2/linuxbridge.pp index 7e17e95e4..3fc373b19 100644 --- a/manifests/agents/ml2/linuxbridge.pp +++ b/manifests/agents/ml2/linuxbridge.pp @@ -127,7 +127,7 @@ class neutron::agents::ml2::linuxbridge ( if size($bridge_mappings) > 0 { neutron_agent_linuxbridge { - 'linux_bridge/bridge_mappings': value => join($bridge_mappings, ','); + 'linux_bridge/bridge_mappings': value => join(any2array($bridge_mappings), ','); } } else { neutron_agent_linuxbridge { diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index d61d2118f..a32741971 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -278,7 +278,7 @@ class neutron::agents::ml2::ovs ( # Set config for bridges that we're going to create # The OVS neutron plugin will talk in terms of the networks in the bridge_mappings - $br_map_str = join($bridge_mappings, ',') + $br_map_str = join(any2array($bridge_mappings), ',') neutron_agent_ovs { 'ovs/bridge_mappings': value => $br_map_str; }