From 5a4ab112c832f985c7e8e3e70bedd5faa83925fd Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Tue, 31 Oct 2023 23:15:34 +0800
Subject: [PATCH] fix: ovs support `member`

OVS 2.15 changed terminology slave to member.
This change reflect that change.

Change-Id: If100748f9dc7083406b8004d0066673b54159b2c
---
 neutron/Chart.yaml                                              | 2 +-
 .../templates/bin/_neutron-openvswitch-agent-readiness.sh.tpl   | 2 +-
 releasenotes/notes/neutron.yaml                                 | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index ff31bc9c7a..b1b32af833 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.24
+version: 0.3.25
 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-openvswitch-agent-readiness.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent-readiness.sh.tpl
index 783ec4a502..6f011045a5 100644
--- a/neutron/templates/bin/_neutron-openvswitch-agent-readiness.sh.tpl
+++ b/neutron/templates/bin/_neutron-openvswitch-agent-readiness.sh.tpl
@@ -38,7 +38,7 @@ ovs-vsctl list-br | grep -q br-int
       bond={{ .name }}
       ovs-appctl -t ${OVS_CTL} bond/list | grep -q  ${bond}
       {{- range .nics }}
-        ovs-appctl -t ${OVS_CTL} bond/show ${bond} | grep -q "slave {{ .name }}"
+        ovs-appctl -t ${OVS_CTL} bond/show ${bond} | grep -q "slave {{ .name }}\|member {{ .name }}"
       {{- end }}
     {{- end }}
   {{- end }}
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 8f4b5f1af4..4c0fb7b03d 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -66,4 +66,5 @@ neutron:
   - 0.3.22 Add BGP Dragent support for running dragent agents as daemonsets
   - 0.3.23 Fix start function template
   - 0.3.24 Add 2023.2 Ubuntu Jammy overrides
+  - 0.3.25 Fix ovs member support for readiness
 ...