Merge "Allow ovn_db_sync to continue on duplicate normalised CIDR" into stable/xena

This commit is contained in:
Zuul 2022-03-30 09:55:39 +00:00 committed by Gerrit Code Review
commit 6b130aad3b
1 changed files with 1 additions and 1 deletions

View File

@ -297,7 +297,7 @@ class OvnNbSynchronizer(OvnDbSynchronizer):
for acla in neutron_acls:
LOG.warning('ACL found in Neutron but not in '
'OVN DB for port group %s', acla['port_group'])
txn.add(self.ovn_api.pg_acl_add(**acla))
txn.add(self.ovn_api.pg_acl_add(**acla, may_exist=True))
with self.ovn_api.transaction(check_error=True) as txn:
for aclr in ovn_acls: