From 1f5da00e991270f5e4b30692a9703011b306b522 Mon Sep 17 00:00:00 2001 From: "Ritchie, Frank (fr801x)" Date: Wed, 20 Sep 2023 16:44:18 -0400 Subject: [PATCH] Fix start function template The template contains extra backslashes which can cause the start function to contain extra backslashes, ie: function start () { exec neutron-server \ --config-file /etc/neutron/neutron.conf \ \ --config-file /etc/neutron/taas_plugin.ini \ \ --config-file /etc/neutron/plugins/ml2/sriov_agent.ini \ --config-file /etc/neutron/plugins/ml2/ml2_conf.ini } With this change the function templates correctly. Change-Id: I9f8ceb203a0039a83ee49c76d6891f7380a6cc08 --- neutron/Chart.yaml | 2 +- neutron/templates/bin/_neutron-server.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 befe1ec0c8..70129ab86a 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.22 +version: 0.3.23 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-server.sh.tpl b/neutron/templates/bin/_neutron-server.sh.tpl index 0954ea4ee6..8cbb688c5d 100644 --- a/neutron/templates/bin/_neutron-server.sh.tpl +++ b/neutron/templates/bin/_neutron-server.sh.tpl @@ -23,13 +23,13 @@ function start () { {{- if ( has "ovn" .Values.network.backend ) }} --config-file /tmp/pod-shared/ovn.ini \ {{- end }} -{{- if .Values.conf.plugins.taas.taas.enabled }} \ +{{- if .Values.conf.plugins.taas.taas.enabled }} --config-file /etc/neutron/taas_plugin.ini \ {{- end }} -{{- if ( has "sriov" .Values.network.backend ) }} \ +{{- if ( has "sriov" .Values.network.backend ) }} --config-file /etc/neutron/plugins/ml2/sriov_agent.ini \ {{- end }} -{{- if .Values.conf.plugins.l2gateway }} \ +{{- if .Values.conf.plugins.l2gateway }} --config-file /etc/neutron/l2gw_plugin.ini \ {{- end }} {{- if ( has "tungstenfabric" .Values.network.backend ) }} diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml index 9aee23157b..ffead48e91 100644 --- a/releasenotes/notes/neutron.yaml +++ b/releasenotes/notes/neutron.yaml @@ -64,4 +64,5 @@ neutron: - 0.3.20 Add Ubuntu Jammy overrides - 0.3.21 Run native netns cleanup - 0.3.22 Add BGP Dragent support for running dragent agents as daemonsets + - 0.3.23 Fix start function template ...