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
4 changes: 2 additions & 2 deletions ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ hosts:
- digitalocean:
debian11-x64-1: {ip: 174.138.79.159, swap_file_size_mb: 2048}
debian12-x64-1: {ip: 159.203.105.159, swap_file_size_mb: 2048}
fedora41-x64-1: {ip: 165.227.191.35}
fedora41-x64-2: {ip: 159.65.246.5}
fedora42-x64-1: {ip: 174.138.62.120}
fedora42-x64-2: {ip: 104.131.92.208}
fedora43-x64-1: {ip: 165.227.191.35}
fedora43-x64-2: {ip: 159.65.246.5}
freebsd13-x64-1: {ip: 138.197.25.49, user: freebsd, swap_file_size_mb: 2048}
freebsd13-x64-2: {ip: 159.89.188.229, user: freebsd, swap_file_size_mb: 2048}
rhel8-x64-1: {ip: 161.35.139.78, build_test_v8: yes, swap_file_size_mb: 2048}
Expand Down
24 changes: 0 additions & 24 deletions ansible/roles/bootstrap/tasks/partials/digitalocean/fedora40.yml

This file was deleted.

15 changes: 3 additions & 12 deletions ansible/roles/bootstrap/tasks/partials/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,14 @@
# use our own logic. Perhaps better to avoid ansible facts altogether?
#

- name: check for {{ 'libselinux-python' if os in ("fedora30") else 'python3-libselinux' }} bindings
raw: dnf info {{ 'libselinux-python' if os in ("fedora30") else 'python3-libselinux' }} | grep Installed
- name: check for python3-libselinux bindings
raw: dnf info python3-libselinux | grep Installed
check_mode: no
register: has_libselinux
failed_when: has_libselinux.rc > 1

- name: install libselinux-python bindings
when: os in ("fedora30") and has_libselinux.rc == 1
raw: dnf install -y libselinux-python

- name: install python3-libselinux bindings
when: os not in ("fedora30") and has_libselinux.rc == 1
when: has_libselinux.rc == 1
raw: dnf install -y python3-libselinux

- name: disable selinux
Expand All @@ -35,8 +31,3 @@
- name: remove firewalld
when: has_firewalld.rc == 0
raw: dnf remove -y firewalld

# https://github.com/ansible/ansible/issues/84206
- name: install python3-libdnf5
when: os in ("fedora41")
raw: dnf install -y python3-libdnf5
2 changes: 1 addition & 1 deletion ansible/roles/java-base/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ packages: {
'centos': 'java-11-openjdk-headless',
'debian11': 'openjdk-17-jre-headless',
'debian12': 'openjdk-17-jre-headless',
'fedora': 'java-17-openjdk-headless',
'fedora42': 'java-21-openjdk-headless',
'fedora43': 'java-25-openjdk-headless',
'freebsd': 'openjdk17-jre',
'macos': 'temurin17',
'rhel7': 'java-11-openjdk',
Expand Down