From 601e6ca47a3ec851acf25a76ba006117938f26df Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Wed, 15 Jan 2020 16:51:37 -0600
Subject: [PATCH] OVS: enable setting threads for handler and revalidator

This PS enables the ability to configure the handler and
revalidator threads.

See: https://bugs.launchpad.net/ubuntu/+source/openvswitch/+bug/1827264/comments/6
Change-Id: I789da34104ac3cfb6a38bf4435a652da45c55e63
Signed-off-by: Pete Birley <pete@port.direct>
---
 openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl | 7 +++++++
 openvswitch/values.yaml                                | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl b/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
index 877270510..23ef00d8c 100644
--- a/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
+++ b/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
@@ -43,6 +43,13 @@ function start () {
 
   ovs-vsctl --db=unix:${OVS_SOCKET} --no-wait show
 
+{{- if .Values.conf.ovs_other_config.handler_threads }}
+  ovs-vsctl --db=unix:${OVS_SOCKET} --no-wait set Open_vSwitch . other_config:n-handler-threads={{ .Values.conf.ovs_other_config.handler_threads }}
+{{- end }}
+{{- if .Values.conf.ovs_other_config.revalidator_threads }}
+  ovs-vsctl --db=unix:${OVS_SOCKET} --no-wait set Open_vSwitch . other_config:n-revalidator-threads={{ .Values.conf.ovs_other_config.revalidator_threads }}
+{{- end }}
+
 {{- if .Values.conf.ovs_dpdk.enabled }}
     ovs-vsctl --db=unix:${OVS_SOCKET} --no-wait set Open_vSwitch . other_config:dpdk-hugepage-dir={{ .Values.conf.ovs_dpdk.hugepages_mountpath | quote }}
     ovs-vsctl --db=unix:${OVS_SOCKET} --no-wait set Open_vSwitch . other_config:dpdk-socket-mem={{ .Values.conf.ovs_dpdk.socket_memory | quote }}
diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml
index 4740ce9c8..0a4ab834d 100644
--- a/openvswitch/values.yaml
+++ b/openvswitch/values.yaml
@@ -195,6 +195,9 @@ manifests:
 conf:
   openvswitch_db_server:
     ptcp_port: null
+  ovs_other_config:
+    handler_threads: null
+    revalidator_threads: null
   ovs_dpdk:
     enabled: false
     ## Mandatory parameters. Please uncomment when enabling DPDK