From 42712e1d36137fab5742b181905141edadca618f Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Fri, 30 Oct 2020 13:45:26 -0500 Subject: [PATCH] Pass ovs agent config to dhcp agent Since metadata server is accessed via dhcp namespace, dhcp relies on conf.OVS.datapath_type for [0] logic to disable checksum offloading that is not supported with ovs-dpdk, making metadata server not available. [0] https://opendev.org/openstack/neutron/src/branch/stable/train/neutron/agent/linux/interface.py#L444-L446 Change-Id: I382af9d9e83b39fd9a616351e7cd5a752a603e77 Signed-off-by: Andrii Ostapenko --- neutron/Chart.yaml | 2 +- neutron/templates/bin/_neutron-dhcp-agent.sh.tpl | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml index cff1c3cdb2..f3d7f8f482 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.1.3 +version: 0.1.4 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-dhcp-agent.sh.tpl b/neutron/templates/bin/_neutron-dhcp-agent.sh.tpl index 1e1eaa1844..0f73e5a391 100644 --- a/neutron/templates/bin/_neutron-dhcp-agent.sh.tpl +++ b/neutron/templates/bin/_neutron-dhcp-agent.sh.tpl @@ -16,8 +16,11 @@ limitations under the License. set -x exec neutron-dhcp-agent \ - --config-file /etc/neutron/neutron.conf \ + --config-file /etc/neutron/neutron.conf \ {{- if and ( empty .Values.conf.neutron.DEFAULT.host ) ( .Values.pod.use_fqdn.neutron_agent ) }} --config-file /tmp/pod-shared/neutron-agent.ini \ {{- end }} - --config-file /etc/neutron/dhcp_agent.ini +{{- if ( has "openvswitch" .Values.network.backend ) }} + --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \ +{{- end }} + --config-file /etc/neutron/dhcp_agent.ini