openstack/openstack-helm
Code Issues Proposed changes

Fix readiness probe of neutron-ovs-agent for OVS<2.10.0

Browse Source 
A recently introduced readiness probe for neutron-ovs-agent makes use of
an OVSDB table entry 'dpdk_initialized' which does not exist in OVS
versions preceeding v2.10.0. This patch changes the readiness probe to
exit successfully if this table entry does not exit. Thereby it does not
give any guarantees for older versions of OVS, but at least allows the
readiness probe to pass.

Change-Id: Ic77c6bdd60730c1a7c5e55fdb4afc6db938f0ddb
This commit is contained in:
Georg Kunz 2019-10-18 14:51:41 +02:00
parent be3a4f65de
commit dddbf37c0e
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/templates/bin/_neutron-openvswitch-agent-readiness.sh.tpl
View File

@ -26,10 +26,6 @@ ovs-vsctl list-br | grep -q br-int
[ -z "$(/usr/bin/ovs-vsctl show | grep error:)" ]
{{ if .Values.conf.ovs_dpdk.enabled }}
# Check if dpdk is initialized
[ "$(ovs-vsctl get Open_vSwitch . dpdk_initialized)" == true ]
{{- if hasKey .Values.conf.ovs_dpdk "nics"}}
# Check if port(s) and bridge(s) are configured.
{{- range .Values.conf.ovs_dpdk.nics }}
@ -48,5 +44,4 @@ ovs-vsctl list-br | grep -q br-int
{{- end }}
{{- end }}
{{- end }}
{{ end }}