From d279c5ecdf5fdd7946ed2810db34f1effaf089f2 Mon Sep 17 00:00:00 2001
From: "SPEARS, DUSTIN (ds443n)" <ds443n@att.com>
Date: Thu, 1 Sep 2022 10:52:03 -0400
Subject: [PATCH] [libvirt] Remove use of exec

Using the combination of `exec` and `systemd-run` is not compatable with containerd v1.6.6.

Change-Id: I80e3b92915830f7d2377688c9b229631348d4354
---
 libvirt/Chart.yaml                    | 2 +-
 libvirt/templates/bin/_libvirt.sh.tpl | 2 +-
 releasenotes/notes/libvirt.yaml       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libvirt/Chart.yaml b/libvirt/Chart.yaml
index d17726e69..5dee2adeb 100644
--- a/libvirt/Chart.yaml
+++ b/libvirt/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm libvirt
 name: libvirt
-version: 0.1.13
+version: 0.1.14
 home: https://libvirt.org
 sources:
   - https://libvirt.org/git/?p=libvirt.git;a=summary
diff --git a/libvirt/templates/bin/_libvirt.sh.tpl b/libvirt/templates/bin/_libvirt.sh.tpl
index 406239505..5d92b6ccf 100644
--- a/libvirt/templates/bin/_libvirt.sh.tpl
+++ b/libvirt/templates/bin/_libvirt.sh.tpl
@@ -179,4 +179,4 @@ EOF
 fi
 
 #NOTE(portdirect): run libvirtd as a transient unit on the host with the osh-libvirt cgroups applied.
-exec cgexec -g ${CGROUPS%,}:/osh-libvirt systemd-run --scope --slice=system libvirtd --listen
+cgexec -g ${CGROUPS%,}:/osh-libvirt systemd-run --scope --slice=system libvirtd --listen
diff --git a/releasenotes/notes/libvirt.yaml b/releasenotes/notes/libvirt.yaml
index 6e11b5285..18e04e587 100644
--- a/releasenotes/notes/libvirt.yaml
+++ b/releasenotes/notes/libvirt.yaml
@@ -14,4 +14,5 @@ libvirt:
   - 0.1.11 Remove unused overrides and update default image
   - 0.1.12 Add libvirt exporter as a sidecar
   - 0.1.13 Added OCI registry authentication
+  - 0.1.14 Remove use of exec in libvirt.sh
 ...