From dddbf37c0e6fc485c4d4fef68196c3e49962edf4 Mon Sep 17 00:00:00 2001
From: Georg Kunz <georg.kunz@ericsson.com>
Date: Fri, 18 Oct 2019 14:51:41 +0200
Subject: [PATCH] Fix readiness probe of neutron-ovs-agent for OVS<2.10.0
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
---
.../bin/_neutron-openvswitch-agent-readiness.sh.tpl | 5 -----
1 file changed, 5 deletions(-)
diff --git a/neutron/templates/bin/_neutron-openvswitch-agent-readiness.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent-readiness.sh.tpl
index d78ac5eb79..5b4f32786e 100644
--- a/neutron/templates/bin/_neutron-openvswitch-agent-readiness.sh.tpl
+++ b/neutron/templates/bin/_neutron-openvswitch-agent-readiness.sh.tpl
@@ -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 }}