openstack
/
neutron
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2022-03-30 10:46:07 +00:00 committed by Gerrit Code Review
parent d47db42993 f1fe5260c7
commit b1b3f47ab9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_db_sync.py
View File

@ -279,7 +279,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: