rebase from oss upstream

stackhpc · May 19, 2022 · 78b266c · 78b266c
1 parent f29191b
commit 78b266c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -30,6 +30,8 @@
     name: libvirtd
     state: started
   become: true
+  listen:
+    - restart libvirt
 
 - name: reload libvirt qemu apparmor profile template
   ansible.builtin.command: apparmor_parser -r /etc/apparmor.d/libvirt/TEMPLATE.qemu

diff --git a/molecule/default/tests/__pycache__/conftest.cpython-39-pytest-7.1.2.pyc b/molecule/default/tests/__pycache__/conftest.cpython-39-pytest-7.1.2.pyc
diff --git a/molecule/default/tests/__pycache__/test_default.cpython-39-pytest-7.1.2.pyc b/molecule/default/tests/__pycache__/test_default.cpython-39-pytest-7.1.2.pyc
diff --git a/tasks/install-daemon.yml b/tasks/install-daemon.yml
@@ -32,7 +32,6 @@
   become: True
   when:
     - ansible_facts.os_family == "RedHat"
-    - ansible_facts.distribution_major_version | int == 7
     - libvirt_host_qemu_emulators | length > 0
 
 - name: Ensure QEMU emulator packages are installed

diff --git a/tasks/pools.yml b/tasks/pools.yml
@@ -18,8 +18,7 @@
   loop: "{{ libvirt_host_pools | flatten(levels=1) }}"
   become: True
 
-- name: include rbd.yml
-  ansible.builtin.include_tasks:
+- ansible.builtin.include_tasks:
     file: rbd.yml
     apply:
       become: True