openstack/tripleo-ansible
Code Issues Proposed changes

Set the OpenFlow protocol while upgrading OVS from 2.11

Browse Source 
We noticed a bug in OSP that OVN controller (2.13) was unable to
contact to OVS bridge (2.11).
Before running the update we should set the OpenFlow protocols on
integration bridge (br-int).

More about the issue [1].

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1843811

Change-Id: I575d67521719ae3908777284b4225eff5169ae6b
This commit is contained in:
Maciej Józefczyk 2020-08-05 16:24:56 +02:00 committed by Brent Eagles
parent de6b6cec38
commit 29993d43b3
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tripleo_ansible/ansible_plugins/modules/tripleo_ovs_upgrade.py
View File

@ -19,6 +19,7 @@ __metaclass__ = type
import glob import glob
import re import re
from ansible.module_utils._text import to_native
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
ANSIBLE_METADATA = { ANSIBLE_METADATA = {
@ -154,6 +155,19 @@ def upgrade_pkg(module, pkg):
return output return output
def set_openflow_version_on_bridges(module, bridges=None):
if bridges is None:
bridges = ['br-int']
for bridge in bridges:
cmd = ['ovs-vsctl', 'set', 'bridge', bridge,
'protocols=OpenFlow13,OpenFlow15']
rc, out, err = module.run_command(cmd)
if rc != 0:
module.warn('Cannot set OpenFlow13 and OpenFlow15 '
'protocol on a bridge: %s: %s.' %
(bridge, to_native(err)))
def layer_product_upgrade(module, result, ovs_pkg, lp_ovs_current_version): def layer_product_upgrade(module, result, ovs_pkg, lp_ovs_current_version):
lp_ovs_coming_versions = get_version(module, 'rhosp-openvswitch') lp_ovs_coming_versions = get_version(module, 'rhosp-openvswitch')
ovs_current_version = get_version(module, ovs_pkg, new=False) ovs_current_version = get_version(module, ovs_pkg, new=False)
@ -166,6 +180,9 @@ def layer_product_upgrade(module, result, ovs_pkg, lp_ovs_current_version):
if flatten_version(lp_ovs_coming_versions) \ if flatten_version(lp_ovs_coming_versions) \
!= flatten_version(ovs_current_version): != flatten_version(ovs_current_version):
# NOTE(mjozefcz): Workaround for bz1863024.
if '2.11' == flatten_version(ovs_current_version, join_str='.'):
set_openflow_version_on_bridges(module)
ovs_pkgs = get_current_ovs_pkg_names(module, pkg_base_name) ovs_pkgs = get_current_ovs_pkg_names(module, pkg_base_name)
remove_package_noaction(module, ovs_pkgs, remove_package_noaction(module, ovs_pkgs,
excludes=['selinux']) excludes=['selinux'])