Skip to content

Commit 9647b55

Browse files
committed
Enable SELinux in permissive mode in overcloud host images
This matches our current defaults.
1 parent e81da68 commit 9647b55

File tree

7 files changed

+7
-21
lines changed

7 files changed

+7
-21
lines changed

etc/kayobe/environments/ci-aio/globals.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ os_release: >-
5555
{{ (lookup('pipe', '. /etc/os-release && echo $VERSION_CODENAME') | trim) if os_distribution == 'ubuntu' else
5656
(lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' }}
5757
58-
###############################################################################
59-
60-
# Avoid a reboot.
61-
selinux_state: disabled
62-
6358
###############################################################################
6459
# Dummy variable to allow Ansible to accept this file.
6560
workaround_ansible_issue_8743: yes

etc/kayobe/environments/ci-aio/inventory/group_vars/controllers/selinux

Lines changed: 0 additions & 4 deletions
This file was deleted.

etc/kayobe/environments/ci-builder/globals.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,3 @@
77
# OS distribution name. Valid options are "rocky", "ubuntu". Default is
88
# "rocky".
99
os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
10-
11-
###############################################################################
12-
# SELinux.
13-
14-
# Avoid a reboot.
15-
selinux_state: disabled

etc/kayobe/environments/ci-multinode/globals.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ os_release: >-
6060
stackhpc_write_barbican_role_id_to_file: true
6161
stackhpc_barbican_role_id_file_path: "/tmp/barbican-role-id"
6262

63-
###############################################################################
64-
65-
# Avoid a reboot.
66-
selinux_state: disabled
67-
6863
###############################################################################
6964
# Dummy variable to allow Ansible to accept this file.
7065
workaround_ansible_issue_8743: yes
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
# Overcloud host image versioning tags
33
# These images must be in SMS, since they are used by our AIO CI runners
4+
# TODO: Rebuild with SELinux enabled
45
stackhpc_rocky_9_overcloud_host_image_version: "2023.1-20240126T093158"
56
stackhpc_ubuntu_jammy_overcloud_host_image_version: "2023.1-20240325T130221"

etc/kayobe/stackhpc-overcloud-dib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ stackhpc_overcloud_dib_name: "deployment_image"
2323
stackhpc_overcloud_dib_elements:
2424
- "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container-stackhpc{% else %}minimal{% endif %}"
2525
- "cloud-init-datasources"
26-
- "{% if os_distribution == 'rocky' %}disable-selinux{% endif %}"
26+
- "{% if os_distribution == 'rocky' %}selinux-permissive{% endif %}"
2727
- "enable-serial-console"
2828
- "{% if kayobe_environment == 'ci-builder' %}etc-hosts{% endif %}"
2929
- "vm"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
upgrade:
3+
- |
4+
Enables SELinux in permissive mode in the overcloud host image. This
5+
matches the default configuration for SELinux in StackHPC Kayobe Configuration.

0 commit comments

Comments
 (0)