From 589785133581d6d403227663f9d92dad412eaec2 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Mon, 20 Feb 2023 19:53:55 +0100 Subject: [PATCH] Do no set ovn-match-northd-version to true by default. This was introduced in commit ec21edf4d9d548c766dbe4ba9adfb045d0176bf4 when ovn-controllers were not updated before northdb. Now, ovn-controller are updated first so the "Fail-safe upgrade" procedure[1] should not be used by default anymore. Closes-Bug: #2007870 [1] https://docs.ovn.org/en/latest/intro/install/ovn-upgrades.html#fail-safe-upgrade Change-Id: I38829bc84ecc4cdeabd72e94db8341e86a2c1222 (cherry picked from commit 5d75fafe28f546fe46a2a535a91f0232353bf835) --- manifests/profile/base/neutron/agents/ovn.pp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manifests/profile/base/neutron/agents/ovn.pp b/manifests/profile/base/neutron/agents/ovn.pp index d7a73806c..a1629fb97 100644 --- a/manifests/profile/base/neutron/agents/ovn.pp +++ b/manifests/profile/base/neutron/agents/ovn.pp @@ -69,9 +69,8 @@ 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), ','), - enable_ovn_match_northd => true, - ovn_chassis_mac_map => $ovn_chassis_mac_map, + ovn_remote => join(any2array($sb_conn), ','), + ovn_chassis_mac_map => $ovn_chassis_mac_map, } } }