Merge "Remove libvirt packaged dependencies" into stable/train
This commit is contained in:
commit
a894706775
|
@ -856,18 +856,12 @@ 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
|
||||
|
@ -878,12 +872,12 @@ outputs:
|
|||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/etc/sysconfig/libvirt-guests
|
||||
EnvironmentFile=-/var/lib/config-data/puppet-generated/nova_libvirt/etc/sysconfig/libvirt-guests
|
||||
# Hack just call traditional service until we factor
|
||||
# out the code
|
||||
ExecStart=/usr/libexec/libvirt-guests.sh start
|
||||
ExecStart=/bin/{{container_cli}} exec nova_libvirt /bin/sh -x /usr/libexec/libvirt-guests.sh start
|
||||
ExecStop=/bin/{{container_cli}} stop nova_compute
|
||||
ExecStop=/usr/libexec/libvirt-guests.sh stop
|
||||
ExecStop=/bin/{{container_cli}} exec nova_libvirt /bin/sh -x /usr/libexec/libvirt-guests.sh stop
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
StandardOutput=journal+console
|
||||
|
@ -895,7 +889,6 @@ outputs:
|
|||
systemd:
|
||||
name: libvirt-guests
|
||||
enabled: yes
|
||||
state: started
|
||||
daemon_reload: yes
|
||||
- name: install tripleo_nova_libvirt_guests systemd unit file (podman)
|
||||
when:
|
||||
|
@ -906,7 +899,6 @@ 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,7 +554,6 @@ 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,6 +30,9 @@ 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
|
||||
|
@ -67,5 +70,9 @@ outputs:
|
|||
value:
|
||||
service_name: nova_libvirt_guests
|
||||
config_settings: {get_attr: [RoleParametersValue, value]}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::nova::compute::libvirt_guests
|
||||
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}
|
||||
|
|
|
@ -305,7 +305,22 @@ outputs:
|
|||
fail:
|
||||
msg: nova-vnc-proxy isn't working (healthcheck failed)
|
||||
when: nova_vnc_proxy_healthcheck_state.status.ExecMainStatus != '0'
|
||||
host_prep_tasks: {get_attr: [NovaLogging, host_prep_tasks]}
|
||||
host_prep_tasks:
|
||||
list_concat:
|
||||
- {get_attr: [NovaLogging, host_prep_tasks]}
|
||||
- - name: ensure qemu group is present on the host
|
||||
group:
|
||||
name: qemu
|
||||
gid: 107
|
||||
state: present
|
||||
- name: ensure qemu user is present on the host
|
||||
user:
|
||||
name: qemu
|
||||
uid: 107
|
||||
group: qemu
|
||||
state: present
|
||||
shell: /sbin/nologin
|
||||
comment: qemu user
|
||||
fast_forward_upgrade_tasks:
|
||||
- when:
|
||||
- step|int == 0
|
||||
|
|
Loading…
Reference in New Issue