openstack/openstack-helm
Code Issues Proposed changes

Fix: Allow multiple ovs opetions in ovs-vsctl

Browse Source 
story: 2010934

Change-Id: I15ac563a8bf0fd7a01a5f29317b23bdabd615ab2
This commit is contained in:
ricolin 2023-10-31 21:50:43 +08:00
parent 5a4ab112c8
commit 45b44f74e5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Neutron description: OpenStack-Helm Neutron
name: neutron name: neutron
version: 0.3.25 version: 0.3.26
home: https://docs.openstack.org/neutron/latest/ home: https://docs.openstack.org/neutron/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
sources: sources:

6
neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
View File

@ -25,8 +25,8 @@ OVS_CTL=/run/openvswitch/ovs-vswitchd.${OVS_PID}.ctl
chown neutron: ${OVS_CTL} chown neutron: ${OVS_CTL}
function get_dpdk_config_value { function get_dpdk_config_value {
values=$1 values=${@:1:$#-1}
filter=$2 filter=${!#}
value=$(echo ${values} | jq -r ${filter}) value=$(echo ${values} | jq -r ${filter})
if [[ "${value}" == "null" ]]; then if [[ "${value}" == "null" ]]; then
echo "" 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} set Bridge "${dpdk_bridge}" other_config:update_config=false
ovs-vsctl --db=unix:${OVS_SOCKET} --may-exist add-bond "${dpdk_bridge}" "${bond_name}" \ ovs-vsctl --db=unix:${OVS_SOCKET} --may-exist add-bond "${dpdk_bridge}" "${bond_name}" \
${nic_name_str} \ ${nic_name_str} \
"${ovs_options}" ${dev_args_str} ${ovs_options} ${dev_args_str}
fi fi
done < "/tmp/bonds_array" done < "/tmp/bonds_array"

1
releasenotes/notes/neutron.yaml
View File

@ -67,4 +67,5 @@ neutron:
- 0.3.23 Fix start function template - 0.3.23 Fix start function template
- 0.3.24 Add 2023.2 Ubuntu Jammy overrides - 0.3.24 Add 2023.2 Ubuntu Jammy overrides
- 0.3.25 Fix ovs member support for readiness - 0.3.25 Fix ovs member support for readiness
- 0.3.26 Fix ovs options to allow multiple options
... ...