Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions etc/kayobe/environments/ci-aio/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ os_release: >-
{{ (lookup('pipe', '. /etc/os-release && echo $VERSION_CODENAME') | trim) if os_distribution == 'ubuntu' else
(lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' }}

###############################################################################

# Avoid a reboot.
selinux_state: disabled

###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes

This file was deleted.

6 changes: 0 additions & 6 deletions etc/kayobe/environments/ci-builder/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,3 @@
# OS distribution name. Valid options are "rocky", "ubuntu". Default is
# "rocky".
os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"

###############################################################################
# SELinux.

# Avoid a reboot.
selinux_state: disabled
5 changes: 0 additions & 5 deletions etc/kayobe/environments/ci-multinode/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ os_release: >-
stackhpc_write_barbican_role_id_to_file: true
stackhpc_barbican_role_id_file_path: "/tmp/barbican-role-id"

###############################################################################

# Avoid a reboot.
selinux_state: disabled

###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes
1 change: 1 addition & 0 deletions etc/kayobe/pulp-host-image-versions.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
# Overcloud host image versioning tags
# These images must be in SMS, since they are used by our AIO CI runners
# TODO: Rebuild with SELinux enabled
stackhpc_rocky_9_overcloud_host_image_version: "2023.1-20240126T093158"
stackhpc_ubuntu_jammy_overcloud_host_image_version: "2023.1-20240325T130221"
2 changes: 1 addition & 1 deletion etc/kayobe/stackhpc-overcloud-dib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ stackhpc_overcloud_dib_name: "deployment_image"
stackhpc_overcloud_dib_elements:
- "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container-stackhpc{% else %}minimal{% endif %}"
- "cloud-init-datasources"
- "{% if os_distribution == 'rocky' %}disable-selinux{% endif %}"
- "{% if os_distribution == 'rocky' %}selinux-permissive{% endif %}"
- "enable-serial-console"
- "{% if kayobe_environment == 'ci-builder' %}etc-hosts{% endif %}"
- "vm"
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/selinux-host-image-ff0fed2583cae7b0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
upgrade:
- |
Enables SELinux in permissive mode in the overcloud host image. This
matches the default configuration for SELinux in StackHPC Kayobe Configuration.
Loading