openstack/puppet-neutron
Code Issues Proposed changes

Force cast bridge mappings as an array

Browse Source 
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
This commit is contained in:
Bernard Cafarelli 2020-03-05 17:09:39 +01:00
parent e3a932d025
commit 73d64f2cc1
No known key found for this signature in database
GPG Key ID: 9531F08245465A52
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agents/ml2/linuxbridge.pp
View File

@ -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 {

2
manifests/agents/ml2/ovs.pp
View File

@ -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;
}