openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix libvirt-guests handling post virt-guest-shutdown 

Tripleo_nova_libvirt_guests.service calls libvirt-guests.sh
assuminig there is monolithic libvirt container running.
That's not the case for modular libvirt. Use a proper container
name for that.

Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Change-Id: I7f481f2772f668e7804be93c545116d19ada46ae
(cherry picked from commit f97ac00419)
This commit is contained in:
Bogdan Dobrelya 2022-05-24 16:46:39 +02:00
parent b17c181b2a
commit 98c953afa6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -1515,8 +1515,8 @@ outputs:
[Service]
EnvironmentFile=-/etc/sysconfig/libvirt-guests
ExecStart=/bin/{{container_cli}} exec nova_libvirt /bin/rm -f /var/lib/libvirt/libvirt-guests
ExecStop=/bin/{{container_cli}} exec nova_libvirt /bin/sh -x /usr/libexec/libvirt-guests.sh shutdown
ExecStart=/bin/podman exec nova_virtproxyd /bin/rm -f /var/lib/libvirt/libvirt-guests
ExecStop=/bin/podman exec nova_virtproxyd /bin/sh -x /usr/libexec/libvirt-guests.sh shutdown
Type=oneshot
RemainAfterExit=yes
StandardOutput=journal+console