From b6606b8fd7332a4f3e426d778757aff6f22dcf83 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Tue, 24 Nov 2020 02:46:21 +0100 Subject: [PATCH] Enable ovn controller to be updated before ovn-northd. Setting this parameter on recent enough ovn controller[1] allows the update of ovn-controller before ovn-northd without breaking the creation of new flows. This is the usual pattern of an tripleo update. [1] >= ovn2.13-20.09.0-17 Conflicts: manifests/profile/base/neutron/agents/ovn.pp Change-Id: Ibbdb9d68c5fe6483357b6cdbe63ccdf8f3e097f5 Depends-On: https://review.opendev.org/c/openstack/puppet-ovn/+/828866 (cherry picked from commit ec21edf4d9d548c766dbe4ba9adfb045d0176bf4) --- manifests/profile/base/neutron/agents/ovn.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/profile/base/neutron/agents/ovn.pp b/manifests/profile/base/neutron/agents/ovn.pp index a1629fb97..d7a73806c 100644 --- a/manifests/profile/base/neutron/agents/ovn.pp +++ b/manifests/profile/base/neutron/agents/ovn.pp @@ -69,8 +69,9 @@ class tripleo::profile::base::neutron::agents::ovn ( } $sb_conn = $db_hosts.map |$h| { join([$protocol, normalize_ip_for_uri($h), "${ovn_sbdb_port}"], ':') } class { 'ovn::controller': - ovn_remote => join(any2array($sb_conn), ','), - ovn_chassis_mac_map => $ovn_chassis_mac_map, + ovn_remote => join(any2array($sb_conn), ','), + enable_ovn_match_northd => true, + ovn_chassis_mac_map => $ovn_chassis_mac_map, } } }