openstack
/
puppet-tripleo
Code Issues Proposed changes

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

(victoria to train)
Conflicts:
	manifests/profile/base/neutron/agents/ovn.pp

Resolved conflict caused by class inclusion by absolute names.

Change-Id: Ibbdb9d68c5fe6483357b6cdbe63ccdf8f3e097f5
Depends-On: https://review.opendev.org/c/openstack/puppet-ovn/+/828870
(cherry picked from commit ec21edf4d9)
(cherry picked from commit 2c1b01ff0d)
This commit is contained in:
Sofer Athlan-Guyot 2020-11-24 02:46:21 +01:00 committed by Takashi Kajinami
parent f404729666
commit 0fca0ad78b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/profile/base/neutron/agents/ovn.pp
View File

@ -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,
}
}
}