Merge "Remove libvirt packaged dependencies"
This commit is contained in:
commit
b3f7907e8c
@ -855,18 +855,12 @@ outputs:
|
|||||||
- resume_guests_state_on_host_boot_enabled|bool
|
- resume_guests_state_on_host_boot_enabled|bool
|
||||||
- container_cli == 'docker'
|
- container_cli == 'docker'
|
||||||
block:
|
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
|
- name: libvirt-guests unit to stop nova_compute container before shutdown VMs
|
||||||
copy:
|
copy:
|
||||||
dest: /etc/systemd/system/libvirt-guests.service
|
dest: /etc/systemd/system/libvirt-guests.service
|
||||||
content: |
|
content: |
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Suspend/Resume Running libvirt Guests
|
Description=Suspend/Resume Running libvirt Guests
|
||||||
Requires=virt-guest-shutdown.target
|
|
||||||
After=network.target
|
After=network.target
|
||||||
After=time-sync.target
|
After=time-sync.target
|
||||||
After=virt-guest-shutdown.target
|
After=virt-guest-shutdown.target
|
||||||
@ -877,12 +871,12 @@ outputs:
|
|||||||
Documentation=https://libvirt.org
|
Documentation=https://libvirt.org
|
||||||
|
|
||||||
[Service]
|
[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
|
# Hack just call traditional service until we factor
|
||||||
# out the code
|
# 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=/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
|
Type=oneshot
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
StandardOutput=journal+console
|
StandardOutput=journal+console
|
||||||
@ -894,7 +888,6 @@ outputs:
|
|||||||
systemd:
|
systemd:
|
||||||
name: libvirt-guests
|
name: libvirt-guests
|
||||||
enabled: yes
|
enabled: yes
|
||||||
state: started
|
|
||||||
daemon_reload: yes
|
daemon_reload: yes
|
||||||
- name: install tripleo_nova_libvirt_guests systemd unit file (podman)
|
- name: install tripleo_nova_libvirt_guests systemd unit file (podman)
|
||||||
when:
|
when:
|
||||||
@ -905,7 +898,6 @@ outputs:
|
|||||||
systemd:
|
systemd:
|
||||||
name: libvirt-guests
|
name: libvirt-guests
|
||||||
enabled: no
|
enabled: no
|
||||||
state: stopped
|
|
||||||
masked: yes
|
masked: yes
|
||||||
daemon_reload: yes
|
daemon_reload: yes
|
||||||
- name: libvirt-guests unit to stop nova_compute container before shutdown VMs
|
- name: libvirt-guests unit to stop nova_compute container before shutdown VMs
|
||||||
|
@ -554,7 +554,6 @@ outputs:
|
|||||||
list_join:
|
list_join:
|
||||||
- "\n"
|
- "\n"
|
||||||
- - include tripleo::profile::base::nova::libvirt
|
- - include tripleo::profile::base::nova::libvirt
|
||||||
- include tripleo::profile::base::nova::compute::libvirt_guests
|
|
||||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||||
config_image: {get_param: ContainerNovaLibvirtConfigImage}
|
config_image: {get_param: ContainerNovaLibvirtConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
|
@ -30,6 +30,9 @@ parameters:
|
|||||||
default: {}
|
default: {}
|
||||||
description: Parameters specific to the role
|
description: Parameters specific to the role
|
||||||
type: json
|
type: json
|
||||||
|
ContainerNovaLibvirtConfigImage:
|
||||||
|
description: The container image to use for the nova_libvirt config_volume
|
||||||
|
type: string
|
||||||
NovaResumeGuestsStateOnHostBoot:
|
NovaResumeGuestsStateOnHostBoot:
|
||||||
default: false
|
default: false
|
||||||
description: Whether to start running instance on compute host reboot
|
description: Whether to start running instance on compute host reboot
|
||||||
@ -67,5 +70,9 @@ outputs:
|
|||||||
value:
|
value:
|
||||||
service_name: nova_libvirt_guests
|
service_name: nova_libvirt_guests
|
||||||
config_settings: {get_attr: [RoleParametersValue, value]}
|
config_settings: {get_attr: [RoleParametersValue, value]}
|
||||||
|
puppet_config:
|
||||||
|
config_volume: nova_libvirt
|
||||||
|
puppet_tags: libvirtd_config,nova_config,file,libvirt_tls_password
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::nova::compute::libvirt_guests
|
include ::tripleo::profile::base::nova::compute::libvirt_guests
|
||||||
|
config_image: {get_param: ContainerNovaLibvirtConfigImage}
|
||||||
|
Loading…
Reference in New Issue
Block a user