From f51624fbf14116f04bd2bb28aec95ddfda171302 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Thu, 22 Aug 2024 07:25:33 -0500
Subject: [PATCH] Add DPKD overrides to Nova chart

For all test jobs we explicitly deploy Nova with virt_type=qemu
to make tests less dependent on the infrastructure hardware.

By default Nova sets virt_type=kvm but in case of using
DPDK feature we'd better explicitly set it so.

Change-Id: I88c8d2f8f1cc9d155486773c7052347e916255d8
---
 nova/Chart.yaml                                 |  2 +-
 nova/values_overrides/dpdk.yaml                 |  7 +++++++
 releasenotes/notes/nova.yaml                    |  1 +
 .../component/compute-kit/compute-kit.sh        | 17 +++++++++++++----
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 nova/values_overrides/dpdk.yaml

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 1af35ace76..f6b9eb93c9 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.3.43
+version: 0.3.44
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/values_overrides/dpdk.yaml b/nova/values_overrides/dpdk.yaml
new file mode 100644
index 0000000000..fcbab97249
--- /dev/null
+++ b/nova/values_overrides/dpdk.yaml
@@ -0,0 +1,7 @@
+---
+conf:
+  nova:
+    libvirt:
+      virt_type: kvm
+      cpu_mode: host-model
+...
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 6cbf1d2195..bfd2e31613 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -112,4 +112,5 @@ nova:
   - 0.3.41 Enable custom annotations for Openstack secrets
   - 0.3.42 Update images used by default
   - 0.3.43 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
+  - 0.3.44 Add DPDK overrides
 ...
diff --git a/tools/deployment/component/compute-kit/compute-kit.sh b/tools/deployment/component/compute-kit/compute-kit.sh
index ed27e52b42..d20e1a411f 100755
--- a/tools/deployment/component/compute-kit/compute-kit.sh
+++ b/tools/deployment/component/compute-kit/compute-kit.sh
@@ -34,13 +34,22 @@ helm upgrade --install placement ${OSH_HELM_REPO}/placement --namespace=openstac
     ${OSH_EXTRA_HELM_ARGS_PLACEMENT}
 
 #NOTE: Deploy nova
+tee /tmp/nova.yaml << EOF
+conf:
+  nova:
+    libvirt:
+      virt_type: qemu
+      cpu_mode: none
+  ceph:
+    enabled: ${CEPH_ENABLED}
+bootstrap:
+  wait_for_computes:
+    enabled: true
+EOF
 : ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install nova ${OSH_HELM_REPO}/nova \
     --namespace=openstack \
-    --set bootstrap.wait_for_computes.enabled=true \
-    --set conf.ceph.enabled=${CEPH_ENABLED} \
-    --set conf.nova.libvirt.virt_type=qemu \
-    --set conf.nova.libvirt.cpu_mode=none \
+    --values=/tmp/nova.yaml \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_NOVA}