From b400816905f897f65d41b44cd8041cf11e96e818 Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Thu, 20 Aug 2020 15:59:42 -0230 Subject: [PATCH] Add OpenFlow10 to protocols for backwards compatability We need to add OpenFlow10 to the required protocols to support backwards compatibility with neutron's destroy_patch_ports. Closes-Bug: #1892491 Change-Id: I6865787f4d0b0459ac2eb91c0f1da9c08b36dd8d (cherry picked from commit 3220e4e5e3491d5a59a03a4f8a9adc2b3b326b9b) --- .../ansible_plugins/modules/tripleo_ovs_upgrade.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tripleo_ansible/ansible_plugins/modules/tripleo_ovs_upgrade.py b/tripleo_ansible/ansible_plugins/modules/tripleo_ovs_upgrade.py index 35971ef5d..ebadf6b43 100644 --- a/tripleo_ansible/ansible_plugins/modules/tripleo_ovs_upgrade.py +++ b/tripleo_ansible/ansible_plugins/modules/tripleo_ovs_upgrade.py @@ -160,11 +160,11 @@ def set_openflow_version_on_bridges(module, bridges=None): bridges = ['br-int'] for bridge in bridges: cmd = ['ovs-vsctl', 'set', 'bridge', bridge, - 'protocols=OpenFlow13,OpenFlow15'] + 'protocols=OpenFlow10,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.' % + module.warn('Cannot set new OpenFlow protocols on a bridge: ' + '%s: %s.' % (bridge, to_native(err)))