Browse Source

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
(cherry picked from commit 73d64f2cc1)
changes/45/711945/1
Bernard Cafarelli 4 months ago
parent
commit
37edd6ebd3
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      manifests/agents/ml2/linuxbridge.pp
  2. +1
    -1
      manifests/agents/ml2/ovs.pp

+ 1
- 1
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 {


+ 1
- 1
manifests/agents/ml2/ovs.pp View File

@@ -290,7 +290,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;
}


Loading…
Cancel
Save