Skip to content

Commit 1f0fc6b

Browse files
committed
chore: resync with upstream
1 parent 9eed816 commit 1f0fc6b

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

defaults/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,27 @@ libvirt_host_var_prefix: ""
4040

4141
# Where the Unix Domain sockets are stored
4242
libvirt_host_socket_dir: >-
43-
{%- if libvirt_host_var_prefix -%}
43+
{%- if libvirt_host_var_prefix is truthy -%}
4444
/var/run/{{ libvirt_host_var_prefix }}
4545
{%- endif -%}
4646
4747
# Path to PID file which prevents mulitple instances of the daemon from
4848
# spawning
4949
libvirt_host_pid_path: >-
50-
{%- if libvirt_host_var_prefix -%}
50+
{%- if libvirt_host_var_prefix is truthy -%}
5151
/var/run/{{ libvirt_host_var_prefix }}.pid
5252
{%- endif -%}
5353
5454
# Command line arguments passed to libvirtd by the init system when
5555
# libvirtd is started - quotes will be added
5656
libvirt_host_libvirtd_args: >-
57-
{%- if libvirt_host_pid_path -%}
57+
{%- if libvirt_host_pid_path is truthy -%}
5858
-p {{ libvirt_host_pid_path }}
5959
{%- endif %}
6060
6161
# The libvirt connnection URI
6262
libvirt_host_uri: >-
63-
{%- if libvirt_host_socket_dir -%}
63+
{%- if libvirt_host_socket_dir is truthy -%}
6464
qemu+unix:///system?socket={{ libvirt_host_socket_dir }}/libvirt-sock
6565
{%- endif %}
6666

tasks/config.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
group: root
1010
mode: 0755
1111
become: true
12-
when: libvirt_host_socket_dir | length > 0
12+
when: libvirt_host_socket_dir is truthy
1313

1414
- name: Process lineinfile rules
1515
ansible.builtin.lineinfile: "{{ rule.args }}"
@@ -56,8 +56,7 @@
5656
become: true
5757
loop: "{{ _libvirt_socket_services | selectattr('enabled') }}"
5858
when:
59-
- item.listen_address is not none
60-
- item.listen_address | length > 0
59+
- item.listen_address is truthy
6160
loop_control:
6261
label: "{{ item.service }}"
6362
vars:
@@ -73,8 +72,7 @@
7372
become: true
7473
loop: "{{ _libvirt_socket_services | selectattr('enabled') }}"
7574
when:
76-
- item.listen_address is not none
77-
- item.listen_address | length > 0
75+
- item.listen_address is truthy
7876
loop_control:
7977
label: "{{ item.service }}"
8078
vars:

tasks/validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
defined
3636
when:
3737
- libvirt_host_enable_sasl_support | bool
38-
- libvirt_host_sasl_credentials | rejectattr('password') | length > 0
38+
- libvirt_host_sasl_credentials | rejectattr('password') is truthy

templates/libvirtd.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# {{ ansible_managed }}
2-
{% if libvirt_host_socket_dir | length > 0 %}
2+
{% if libvirt_host_socket_dir is truthy %}
33
unix_sock_dir = "{{ libvirt_host_socket_dir }}"
44
{% endif %}
55
{% for key, value in libvirt_host_libvirtd_conf.items() %}

vars/Debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
# List of package dependencies common to all Debian distributions
33
libvirt_host_libvirt_packages_common:
4-
- qemu-kvm
4+
- qemu-system-x86
55

66
# List of all daemon packages to install.
77
libvirt_host_libvirt_packages_libvirt_daemon:

vars/RedHat.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ libvirt_host_packages_efi_by_version:
3333
40: [] # fedora
3434
41: [] # fedora
3535
42: [] # fedora
36+
43: [] # fedora
3637

3738
libvirt_host_packages_efi: >-
3839
{{ libvirt_host_packages_efi_by_version[ansible_facts.distribution_major_version | int] }}

0 commit comments

Comments
 (0)