From 11121d5f775db709916a78678a3a745f8a265600 Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Tue, 2 Apr 2024 21:38:49 +0800
Subject: [PATCH] Proper chown /run/openvswitch/db.sock under OVN

Change-Id: I7a9e24baacb3ab5768211997d6e9f7c65407bb83
---
 neutron/Chart.yaml                                        | 2 +-
 neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl | 3 +++
 neutron/templates/daemonset-ovn-metadata-agent.yaml       | 2 ++
 releasenotes/notes/neutron.yaml                           | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index 8acd4a3c70..9e2b68c509 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.36
+version: 0.3.37
 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/templates/bin/_neutron-metadata-agent-init.sh.tpl b/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl
index 5b6ce43e1d..1cb25e30e2 100644
--- a/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl
+++ b/neutron/templates/bin/_neutron-metadata-agent-init.sh.tpl
@@ -17,6 +17,9 @@ limitations under the License.
 set -ex
 
 chown ${NEUTRON_USER_UID} /var/lib/neutron/openstack-helm
+{{- if (has "ovn" .Values.network.backend) }}
+chown ${NEUTRON_USER_UID} /run/openvswitch/db.sock
+{{- end }}
 
 {{- if and ( empty .Values.conf.neutron.DEFAULT.host ) ( .Values.pod.use_fqdn.neutron_agent ) }}
 mkdir -p /tmp/pod-shared
diff --git a/neutron/templates/daemonset-ovn-metadata-agent.yaml b/neutron/templates/daemonset-ovn-metadata-agent.yaml
index 47f044dd53..47e12567b9 100644
--- a/neutron/templates/daemonset-ovn-metadata-agent.yaml
+++ b/neutron/templates/daemonset-ovn-metadata-agent.yaml
@@ -101,6 +101,8 @@ spec:
           command:
             - /tmp/neutron-metadata-agent-init.sh
           volumeMounts:
+            - name: run-openvswitch
+              mountPath: /run/openvswitch
             - name: pod-tmp
               mountPath: /tmp
             - name: neutron-bin
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 73c2d67796..6e154150d6 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -78,4 +78,5 @@ neutron:
   - 0.3.34 Update metadata endpoint
   - 0.3.35 Do not attach non-existing interfaces to br-ex bridge for OVS agent
   - 0.3.36 Enable custom annotations for Openstack pods
+  - 0.3.37 Proper chown /run/openvswitch/db.sock under OVN
 ...