From 63529d7dc0d3a494b923978dc711313f2e18bd49 Mon Sep 17 00:00:00 2001
From: dbcocle-ts <dbcocle@titansystem.cn>
Date: Sun, 23 Apr 2023 02:35:23 +0000
Subject: [PATCH] Sync neutron db to ovn nb db when neutron-server start

Neutron server default only log warning when ovn north-bound's db
mismatched with neutron's db. This patch enable auto sync neutron
db to ovn nb db when neutron-server start.

Reference code:
https://opendev.org/openstack/neutron/src/branch/master/neutron/conf/plugins/ml2/drivers/ovn/ovn_conf.py#L98

Change-Id: I005425ce533f48b2c25b28b47b22e94d054e68d2
---
 neutron/Chart.yaml                | 2 +-
 neutron/values_overrides/ovn.yaml | 1 +
 releasenotes/notes/neutron.yaml   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index c3af071022..9dd9dddb56 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.3.6
+version: 0.3.7
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/values_overrides/ovn.yaml b/neutron/values_overrides/ovn.yaml
index 68759df6ce..347ef0e752 100644
--- a/neutron/values_overrides/ovn.yaml
+++ b/neutron/values_overrides/ovn.yaml
@@ -31,6 +31,7 @@ conf:
         ovn_metadata_enabled: True
         ovn_l3_scheduler: leastloaded
         dns_servers: 8.8.8.8,1.1.1.1
+        neutron_sync_mode: repair
   ovn_metadata_agent:
     DEFAULT:
       # we cannot change the proxy socket path as it is declared
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 0c59a672f9..874fe4705e 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -48,4 +48,5 @@ neutron:
   - 0.3.4 Replace node-role.kubernetes.io/master with control-plane
   - 0.3.5 Fix health probe for OVN metadata agent
   - 0.3.6 Fix the issue that ovn metadata not work in muti-node enviroment
+  - 0.3.7 Sync neutron db to ovn nb db when neutron-server start
 ...