Fixes ODL issue where OF port may be set wrong

There is a case where OVS needs to have the OpenFlow configuration
resynced. The regsubst was only replacing one of the ports instead of
all, so sometimes the OpenFlow controller settings on OVS would have
ports 6640 instead of the right port (6653).

Closes-Bug: 1786037

Change-Id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 54188dbcf0)
This commit is contained in:
Tim Rozet 2018-08-08 09:23:11 -04:00
parent 1628943271
commit 242915b3ae
2 changed files with 7 additions and 1 deletions

View File

@ -132,7 +132,7 @@ class tripleo::profile::base::neutron::plugins::ovs::opendaylight (
}
if $step >= 5 {
$odl_of_mgr = regsubst($odl_ovsdb_str , ':6640', ':6653')
$odl_of_mgr = regsubst($odl_ovsdb_str , ':6640', ':6653', 'G')
# Workaround until OpenDayight is capable of synchronizing flows
if ! synchronize_odl_ovs_flows($odl_of_mgr) {
fail('Failed to validate OVS OpenFlow pipeline')

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes issue where OpenFlow port for an ODL deployment would be set
incorrectly to 6640 instead of 6653 in OVS. For more information see
https://bugs.launchpad.net/tripleo/+bug/1786037