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
)
This commit is contained in:
parent
30913d8537
commit
37edd6ebd3
|
@ -127,7 +127,7 @@ class neutron::agents::ml2::linuxbridge (
|
||||||
|
|
||||||
if size($bridge_mappings) > 0 {
|
if size($bridge_mappings) > 0 {
|
||||||
neutron_agent_linuxbridge {
|
neutron_agent_linuxbridge {
|
||||||
'linux_bridge/bridge_mappings': value => join($bridge_mappings, ',');
|
'linux_bridge/bridge_mappings': value => join(any2array($bridge_mappings), ',');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
neutron_agent_linuxbridge {
|
neutron_agent_linuxbridge {
|
||||||
|
|
|
@ -290,7 +290,7 @@ class neutron::agents::ml2::ovs (
|
||||||
|
|
||||||
# Set config for bridges that we're going to create
|
# 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
|
# 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 {
|
neutron_agent_ovs {
|
||||||
'ovs/bridge_mappings': value => $br_map_str;
|
'ovs/bridge_mappings': value => $br_map_str;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue