Merge "Fix remove libvirt apparmor disabled profile"

This commit is contained in:
Zuul 2021-01-12 13:35:03 +00:00 committed by Gerrit Code Review
commit f6ddf564b6
2 changed files with 13 additions and 0 deletions

View File

@ -152,12 +152,19 @@
register: apparmor_libvirtd_profile register: apparmor_libvirtd_profile
when: ansible_distribution == "Ubuntu" when: ansible_distribution == "Ubuntu"
- name: Get stat of libvirtd apparmor disable profile
stat:
path: /etc/apparmor.d/disable/usr.sbin.libvirtd
register: apparmor_libvirtd_disable_profile
when: ansible_distribution == "Ubuntu"
- name: Remove apparmor profile for libvirt - name: Remove apparmor profile for libvirt
command: apparmor_parser -R /etc/apparmor.d/usr.sbin.libvirtd command: apparmor_parser -R /etc/apparmor.d/usr.sbin.libvirtd
become: True become: True
when: when:
- ansible_distribution == "Ubuntu" - ansible_distribution == "Ubuntu"
- apparmor_libvirtd_profile.stat.exists - apparmor_libvirtd_profile.stat.exists
- not apparmor_libvirtd_disable_profile.stat.exists
- name: Get stat of chronyd apparmor profile - name: Get stat of chronyd apparmor profile
stat: stat:

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue where the Libvirt AppArmor profile is disable and the
bootstrap-servers process tries to remove it. See `bug 1909874
<https://bugs.launchpad.net/kolla-ansible/+bug/1909874>`__ for details.