openstack/openstack-helm
Code Issues Proposed changes

Pass ovs agent config to dhcp agent

Browse Source 
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 <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko 2020-10-30 13:45:26 -05:00
parent 32c72a08ea
commit 42712e1d36
No known key found for this signature in database
GPG Key ID: F3E83668DBB223B3
2 changed files with 6 additions and 3 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.1.3 version: 0.1.4
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:

7
neutron/templates/bin/_neutron-dhcp-agent.sh.tpl
View File

@ -16,8 +16,11 @@ limitations under the License.
set -x set -x
exec neutron-dhcp-agent \ 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 ) }} {{- if and ( empty .Values.conf.neutron.DEFAULT.host ) ( .Values.pod.use_fqdn.neutron_agent ) }}
--config-file /tmp/pod-shared/neutron-agent.ini \ --config-file /tmp/pod-shared/neutron-agent.ini \
{{- end }} {{- 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