From 80cf20c586671cfcad1f206a311d3a121a9cbe44 Mon Sep 17 00:00:00 2001
From: Sadegh Hayeri <hayerisadegh@gmail.com>
Date: Wed, 26 Jul 2023 19:57:20 +0330
Subject: [PATCH] Fix OVN system-id check

Change-Id: I8a161893fb84b32f550a99d139f7a57c98b21c12
---
 ovn/Chart.yaml                | 2 +-
 ovn/templates/bin/_ovn.sh.tpl | 4 ++--
 releasenotes/notes/ovn.yaml   | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ovn/Chart.yaml b/ovn/Chart.yaml
index 4187bda66..6a9e88cad 100644
--- a/ovn/Chart.yaml
+++ b/ovn/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v23.3.0
 description: OpenStack-Helm OVN
 name: ovn
-version: 0.1.2
+version: 0.1.3
 home: https://www.ovn.org
 icon: https://www.ovn.org/images/ovn-logo.png
 sources:
diff --git a/ovn/templates/bin/_ovn.sh.tpl b/ovn/templates/bin/_ovn.sh.tpl
index afb84d4e6..a6128d42a 100644
--- a/ovn/templates/bin/_ovn.sh.tpl
+++ b/ovn/templates/bin/_ovn.sh.tpl
@@ -970,8 +970,8 @@ ovn-master() {
 }
 
 add-external-id-configs() {
-  ovs-vsctl get open . external-ids:system-id
-  if [ $? -eq 1 ]; then
+  ovs-vsctl get open . external-ids:system-id 2>&1 | grep -q "no key"
+  if [ $? -eq 0 ]; then
     ovs-vsctl set open . external-ids:system-id="$(uuidgen)"
   fi
 
diff --git a/releasenotes/notes/ovn.yaml b/releasenotes/notes/ovn.yaml
index e8161de6d..e60055fef 100644
--- a/releasenotes/notes/ovn.yaml
+++ b/releasenotes/notes/ovn.yaml
@@ -3,4 +3,5 @@ ovn:
   - 0.1.0 Add OVN!
   - 0.1.1 Fix ovn db persistence issue
   - 0.1.2 Add bridge-mapping configuration
+  - 0.1.3 Fix system-id reuse
 ...