Merge "Make libvirt-guests service work with deprecated monolithic libvirt"

deployment/deprecated/nova/nova-libvirt-container-puppet.yaml

@@ -364,6 +364,8 @@ outputs:
             - 16514
             - '61152-61215'
             - '5900-6923'
+      ansible_group_vars:
+        tripleo_nova_libvirt_virsh_container: nova_libvirt
       monitoring_subscription: {get_param: MonitoringSubscriptionNovaLibvirt}
       config_settings:
         map_merge:

deployment/nova/nova-compute-container-puppet.yaml

@@ -1472,7 +1472,34 @@ outputs:
             when:
               - resume_guests_state_on_host_boot_enabled|bool
             block:
-              - name: libvirt-guests unit to stop nova_compute container before shutdown VMs
+              # NOTE(tkajinam): re-implement this by j2 template.
+              - name: libvirt-guests unit to stop nova_compute container before shutdown VMs (monolithic libvirt)
+                copy:
+                  dest: /etc/systemd/system/tripleo_nova_libvirt_guests.service
+                  content: |
+                    [Unit]
+                    Description=Suspend libvirt Guests in tripleo
+                    Requires=virt-guest-shutdown.target
+                    After=systemd-machined.service
+                    After=network-online.target
+                    After=tripleo_nova_libvirt.target
+                    Before=tripleo_nova_compute.service
+                    Documentation=man:libvirtd(8)
+                    Documentation=https://libvirt.org
+
+                    [Service]
+                    EnvironmentFile=-/etc/sysconfig/libvirt-guests
+                    ExecStart=/bin/podman exec nova_libvirt /bin/rm -f /var/lib/libvirt/libvirt-guests
+                    ExecStop=/bin/podman exec nova_libvirt /bin/sh -x /usr/libexec/libvirt-guests.sh shutdown
+                    Type=oneshot
+                    RemainAfterExit=yes
+                    StandardOutput=journal+console
+                    TimeoutStopSec=0
+
+                    [Install]
+                    WantedBy=multi-user.target
+                when: tripleo_nova_libvirt_virsh_container | default('nova_libvirt') == 'nova_libvirt'
+              - name: libvirt-guests unit to stop nova_compute container before shutdown VMs (modular libvirt)
                 copy:
                   dest: /etc/systemd/system/tripleo_nova_libvirt_guests.service
                   content: |
@@ -1497,6 +1524,7 @@ outputs:
 
                     [Install]
                     WantedBy=multi-user.target
+                when: tripleo_nova_libvirt_virsh_container | default('nova_libvirt') != 'nova_libvirt'
               - name: Making sure virt-guest-shutdown.target is present
                 copy:
                   dest: /etc/systemd/system/virt-guest-shutdown.target

deployment/nova/nova-modular-libvirt-container-puppet.yaml

@@ -388,6 +388,8 @@ outputs:
             - 16514
             - '61152-61215'
             - '5900-6923'
+      ansible_group_vars:
+        tripleo_nova_libvirt_virsh_container: nova_virtproxyd
       monitoring_subscription: {get_param: MonitoringSubscriptionNovaLibvirt}
       config_settings:
         map_merge: