Revert "Remove libvirt packaged dependencies" due to https://bugs.launchpad.net/tripleo/+bug/1860971 and planning a backport later
This reverts commit 220661582e
.
Change-Id: I6db56cec954c4d6272548791e6b73bd01b177769
This commit is contained in:
parent
220661582e
commit
2cbcbb08e5
|
@ -855,12 +855,18 @@ outputs:
|
|||
- resume_guests_state_on_host_boot_enabled|bool
|
||||
- container_cli == 'docker'
|
||||
block:
|
||||
- name: make sure libvirt-client is installed
|
||||
when: resume_guests_state_on_host_boot_enabled|bool
|
||||
package:
|
||||
name: libvirt-client
|
||||
state: present
|
||||
- name: libvirt-guests unit to stop nova_compute container before shutdown VMs
|
||||
copy:
|
||||
dest: /etc/systemd/system/libvirt-guests.service
|
||||
content: |
|
||||
[Unit]
|
||||
Description=Suspend/Resume Running libvirt Guests
|
||||
Requires=virt-guest-shutdown.target
|
||||
After=network.target
|
||||
After=time-sync.target
|
||||
After=virt-guest-shutdown.target
|
||||
|
@ -871,12 +877,12 @@ outputs:
|
|||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/var/lib/config-data/puppet-generated/nova_libvirt/etc/sysconfig/libvirt-guests
|
||||
EnvironmentFile=-/etc/sysconfig/libvirt-guests
|
||||
# Hack just call traditional service until we factor
|
||||
# out the code
|
||||
ExecStart=/bin/{{container_cli}} exec nova_libvirt /bin/sh -x /usr/libexec/libvirt-guests.sh start
|
||||
ExecStart=/usr/libexec/libvirt-guests.sh start
|
||||
ExecStop=/bin/{{container_cli}} stop nova_compute
|
||||
ExecStop=/bin/{{container_cli}} exec nova_libvirt /bin/sh -x /usr/libexec/libvirt-guests.sh stop
|
||||
ExecStop=/usr/libexec/libvirt-guests.sh stop
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
StandardOutput=journal+console
|
||||
|
@ -888,6 +894,7 @@ outputs:
|
|||
systemd:
|
||||
name: libvirt-guests
|
||||
enabled: yes
|
||||
state: started
|
||||
daemon_reload: yes
|
||||
- name: install tripleo_nova_libvirt_guests systemd unit file (podman)
|
||||
when:
|
||||
|
@ -898,6 +905,7 @@ outputs:
|
|||
systemd:
|
||||
name: libvirt-guests
|
||||
enabled: no
|
||||
state: stopped
|
||||
masked: yes
|
||||
daemon_reload: yes
|
||||
- name: libvirt-guests unit to stop nova_compute container before shutdown VMs
|
||||
|
|
|
@ -554,6 +554,7 @@ outputs:
|
|||
list_join:
|
||||
- "\n"
|
||||
- - include tripleo::profile::base::nova::libvirt
|
||||
- include tripleo::profile::base::nova::compute::libvirt_guests
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerNovaLibvirtConfigImage}
|
||||
kolla_config:
|
||||
|
|
|
@ -30,9 +30,6 @@ parameters:
|
|||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerNovaLibvirtConfigImage:
|
||||
description: The container image to use for the nova_libvirt config_volume
|
||||
type: string
|
||||
NovaResumeGuestsStateOnHostBoot:
|
||||
default: false
|
||||
description: Whether to start running instance on compute host reboot
|
||||
|
@ -70,9 +67,5 @@ outputs:
|
|||
value:
|
||||
service_name: nova_libvirt_guests
|
||||
config_settings: {get_attr: [RoleParametersValue, value]}
|
||||
puppet_config:
|
||||
config_volume: nova_libvirt
|
||||
puppet_tags: libvirtd_config,nova_config,file,libvirt_tls_password
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::nova::compute::libvirt_guests
|
||||
config_image: {get_param: ContainerNovaLibvirtConfigImage}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::nova::compute::libvirt_guests
|
||||
|
|
Loading…
Reference in New Issue