From 54188dbcf0046fc0baf70880653b899f6d10dc74 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 8 Aug 2018 09:23:11 -0400 Subject: [PATCH] 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 --- manifests/profile/base/neutron/plugins/ovs/opendaylight.pp | 2 +- .../fix-odl-ovs-openflow-port-resync-79b5f69b71740a6c.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-odl-ovs-openflow-port-resync-79b5f69b71740a6c.yaml diff --git a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp index f365b1792..e3e6e5ce6 100644 --- a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp +++ b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp @@ -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') diff --git a/releasenotes/notes/fix-odl-ovs-openflow-port-resync-79b5f69b71740a6c.yaml b/releasenotes/notes/fix-odl-ovs-openflow-port-resync-79b5f69b71740a6c.yaml new file mode 100644 index 000000000..dd427fc43 --- /dev/null +++ b/releasenotes/notes/fix-odl-ovs-openflow-port-resync-79b5f69b71740a6c.yaml @@ -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