From 45b44f74e56a2506fc1bc5776ed7c68cc744c382 Mon Sep 17 00:00:00 2001
From: ricolin <rlin@vexxhost.com>
Date: Tue, 31 Oct 2023 21:50:43 +0800
Subject: [PATCH] Fix: Allow multiple ovs opetions in ovs-vsctl

story: 2010934

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

diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index b1b32af833..a9112343cf 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.25
+version: 0.3.26
 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-init.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
index 0ac9725f68..883b71a253 100644
--- a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
+++ b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
@@ -25,8 +25,8 @@ OVS_CTL=/run/openvswitch/ovs-vswitchd.${OVS_PID}.ctl
 chown neutron: ${OVS_CTL}
 
 function get_dpdk_config_value {
-  values=$1
-  filter=$2
+  values=${@:1:$#-1}
+  filter=${!#}
   value=$(echo ${values} | jq -r ${filter})
   if [[ "${value}" == "null" ]]; then
     echo ""
@@ -360,7 +360,7 @@ function process_dpdk_bonds {
       ovs-vsctl --db=unix:${OVS_SOCKET} set Bridge "${dpdk_bridge}" other_config:update_config=false
       ovs-vsctl --db=unix:${OVS_SOCKET} --may-exist add-bond "${dpdk_bridge}" "${bond_name}" \
         ${nic_name_str} \
-        "${ovs_options}" ${dev_args_str}
+        ${ovs_options} ${dev_args_str}
     fi
 
   done < "/tmp/bonds_array"
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 4c0fb7b03d..d8e6aa24cc 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -67,4 +67,5 @@ neutron:
   - 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
+  - 0.3.26 Fix ovs options to allow multiple options
 ...