Skip to content

Commit 4b19093

Browse files
committed
Enforce SELinux on EL and Enable Apparmor in Ubuntu/Debian/SUSE
1 parent 6bcc8e0 commit 4b19093

19 files changed

Lines changed: 54 additions & 131 deletions

File tree

Ansible/roles/cloudstack-manager/tasks/centos.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212
- name: Clear all yum cache
1313
command: yum clean all
1414

15-
- name: Set selinux to permissive
16-
command: setenforce permissive
17-
changed_when: false
18-
19-
- name: Ensure selinux is set permanently
20-
selinux: policy=targeted state=permissive
15+
- include: ../../../tasks/configure_selinux.yml
2116

2217
- name: Ensure CA Certs are latest
2318
yum: name=ca-certificates state=latest enablerepo=base

Ansible/roles/cloudstack-manager/tasks/centos8.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@
1919
file: path=/etc/hostname state=absent
2020
when: ansible_distribution_major_version == "7"
2121

22-
- name: Set selinux to permissive
23-
command: setenforce permissive
24-
changed_when: false
25-
26-
- name: Ensure selinux is set permanently
27-
selinux: policy=targeted state=permissive
22+
- include: ../../../tasks/configure_selinux.yml
2823

2924
- name: get name of eth0 connection
3025
shell: nmcli device show eth0 | grep 'GENERAL.CONNECTION' | awk -F ':' '{print $2}' | sed 's/^ *//'

Ansible/roles/cloudstack-manager/tasks/debian.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@
123123
- name: Ensure vhd-util is present
124124
get_url: url="{{ vhdutil_url }}" dest=/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util mode=0755
125125

126+
- include: ../../../tasks/configure_apparmor.yml
127+
126128
- include: ./setupdb.yml
127129

128130
- name: Ensure CloudStack packages are installed (now that mgmt server "db.properties" and "key" files are present)

Ansible/roles/cloudstack-manager/tasks/el9.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@
2929
state: present
3030
tags: services
3131

32-
- name: Set selinux to permissive
33-
command: setenforce permissive
34-
changed_when: false
35-
36-
- name: Ensure selinux is set permanently
37-
selinux: policy=targeted state=permissive
32+
- include: ../../../tasks/configure_selinux.yml
3833

3934
- name: get name of eth0 connection
4035
shell: nmcli device show eth0 | grep 'GENERAL.CONNECTION' | awk -F ':' '{print $2}' | sed 's/^ *//'

Ansible/roles/cloudstack-manager/tasks/suse.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,7 @@
2121
shell: "zypper install -y python3-selinux"
2222
ignore_errors: yes
2323

24-
- name: Set selinux to permissive
25-
command: setenforce permissive
26-
changed_when: false
27-
ignore_errors: yes
28-
29-
- name: Ensure selinux is set permanently
30-
selinux: policy=targeted state=permissive
31-
ignore_errors: yes
24+
- include: ../../../tasks/configure_apparmor.yml
3225

3326
- name: Allow connections on management server required ports with firewall
3427
shell: "firewall-cmd --zone=public --add-port={{ item }}/tcp --permanent"

Ansible/roles/cloudstack-manager/tasks/ubuntu.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
- name: Ensure vhd-util is present
120120
get_url: url="{{ vhdutil_url }}" dest=/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util mode=0755
121121

122+
- include: ../../../tasks/configure_apparmor.yml
123+
122124
- include: ./setupdb.yml
123125

124126
- name: Ensure CloudStack packages are installed (now that mgmt server "db.properties" and "key" files are present)

Ansible/roles/kvm/tasks/centos.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,7 @@
1515
tags:
1616
- kvm
1717

18-
- name: Set selinux to permissive
19-
command: setenforce permissive
20-
changed_when: false
21-
tags:
22-
- kvm
23-
24-
- name: Ensure selinux is set permanently
25-
selinux: policy=targeted state=permissive
18+
- include: ../../../tasks/configure_selinux.yml
2619
tags:
2720
- kvm
2821

Ansible/roles/kvm/tasks/centos8.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,7 @@
1616
tags:
1717
- kvm
1818

19-
- name: Set selinux to permissive
20-
command: setenforce permissive
21-
changed_when: false
22-
tags:
23-
- kvm
24-
25-
- name: Ensure selinux is set permanently
26-
selinux: policy=targeted state=permissive
19+
- include: ../../../tasks/configure_selinux.yml
2720
tags:
2821
- kvm
2922

Ansible/roles/kvm/tasks/debian.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -287,19 +287,7 @@
287287
- name: update /etc/libvirt/qemu.conf
288288
lineinfile: dest=/etc/libvirt/qemu.conf regexp='#vnc_listen = "0.0.0.0"' line='vnc_listen = "0.0.0.0"'
289289

290-
- name: Symlink to disable
291-
file: src=/etc/apparmor.d/usr.sbin.libvirtd dest=/etc/apparmor.d/disable/usr.sbin.libvirtd state=link
292-
293-
- name: Symlink to disable
294-
file: src=/etc/apparmor.d/usr.lib.libvirt.virt-aa-helper dest=/etc/apparmor.d/disable/usr.lib.libvirt.virt-aa-helper state=link
295-
296-
- name: Apparmor parser libvirt
297-
shell: apparmor_parser -R /etc/apparmor.d/usr.sbin.libvirtd
298-
ignore_errors: yes
299-
300-
- name: Apparmor parser libvirt helper
301-
shell: apparmor_parser -R /etc/apparmor.d/usr.lib.libvirt.virt-aa-helper
302-
ignore_errors: yes
290+
- include: ../../../tasks/configure_apparmor.yml
303291

304292
- name: Delete DHCP leases file - bionic onwards
305293
file: path={{ item }} state=absent

Ansible/roles/kvm/tasks/el9.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,7 @@
3030
tags:
3131
- kvm
3232

33-
- name: Set selinux to permissive
34-
command: setenforce permissive
35-
changed_when: false
36-
tags:
37-
- kvm
38-
39-
- name: Ensure selinux is set permanently
40-
selinux: policy=targeted state=permissive
33+
- include: ../../../tasks/configure_selinux.yml
4134
tags:
4235
- kvm
4336

0 commit comments

Comments
 (0)