diff --git a/openstack-helm-infra/debian/deb_folder/patches/0026-Update-libvirt-configuration-script-for-Debian.patch b/openstack-helm-infra/debian/deb_folder/patches/0026-Update-libvirt-configuration-script-for-Debian.patch new file mode 100644 index 00000000..943c155d --- /dev/null +++ b/openstack-helm-infra/debian/deb_folder/patches/0026-Update-libvirt-configuration-script-for-Debian.patch @@ -0,0 +1,40 @@ +From 06de2b1f1b1de06cda47ffac6577794447e7562b Mon Sep 17 00:00:00 2001 +From: Thales Elero Cervi +Date: Mon, 19 Dec 2022 17:19:34 -0300 +Subject: [PATCH] Update libvirt configuration script for Debian + +Update the libvirt.sh template including a conditional check for the +Linux distribution before setting the kvm device permission and +ownership. +This was necessary when the libvirt image was stx-centos based but +now that it is stx-debian based, the newest package versions for both +libvirt and qemu rely on Debian systemd [1] to manage the it. + +[1] https://salsa.debian.org/systemd-team/systemd/-/commit/4fc3fa53bfa6e16ceb6cd312f49003839b56144a + +Signed-off-by: Thales Elero Cervi +Change-Id: Ib2c3b0cbd0666ffd5dd310103c3f1a75b36c330c +--- + libvirt/templates/bin/_libvirt.sh.tpl | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libvirt/templates/bin/_libvirt.sh.tpl b/libvirt/templates/bin/_libvirt.sh.tpl +index c419997e..d8085f5e 100644 +--- a/libvirt/templates/bin/_libvirt.sh.tpl ++++ b/libvirt/templates/bin/_libvirt.sh.tpl +@@ -33,9 +33,11 @@ fi + + rm -f /var/run/libvirtd.pid + +-if [[ -c /dev/kvm ]]; then ++if [ "$(cat /etc/os-release | grep -w NAME= | grep -w CentOS)" ]; then ++ if [[ -c /dev/kvm ]]; then + chmod 660 /dev/kvm + chown root:kvm /dev/kvm ++ fi + fi + + #Setup Cgroups to use when breaking out of Kubernetes defined groups +-- +2.25.1 + diff --git a/openstack-helm-infra/debian/deb_folder/patches/series b/openstack-helm-infra/debian/deb_folder/patches/series index d19e5c63..4067187f 100644 --- a/openstack-helm-infra/debian/deb_folder/patches/series +++ b/openstack-helm-infra/debian/deb_folder/patches/series @@ -16,3 +16,4 @@ 0023-Update-RabbitMQ-probes.patch 0024-Update-openstack-Ingress-for-networking-api-v1.patch 0025-Update-templates-syntax-for-fluxcd-helm-v3.patch +0026-Update-libvirt-configuration-script-for-Debian.patch