From a0a3136044c98e496d2b818ca9d4b06b742e0507 Mon Sep 17 00:00:00 2001 From: mori Date: Wed, 8 Nov 2023 12:46:50 +0100 Subject: [PATCH 1/2] feat: alma8 adaptations on openldap, r, python_pip --- .../tasks/openldap_servers_repo.yml | 28 ++++++++++++------- roles/system/tasks/python_pip.yml | 2 +- roles/system/tasks/r.yml | 19 +++++++++---- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/roles/ldap_kerberos/tasks/openldap_servers_repo.yml b/roles/ldap_kerberos/tasks/openldap_servers_repo.yml index 0bc082d..0ea02d0 100644 --- a/roles/ldap_kerberos/tasks/openldap_servers_repo.yml +++ b/roles/ldap_kerberos/tasks/openldap_servers_repo.yml @@ -2,23 +2,31 @@ # SPDX-License-Identifier: Apache-2.0 --- -- name: Enable openldap-servers repo +- name: Enable openldap-servers repo for Rocky or AlmaLinux community.general.ini_file: - path: "{{ repos[ansible_distribution_major_version]['path'] }}" - section: "{{ repos[ansible_distribution_major_version]['section'] }}" + path: "{{ repos[ansible_distribution][ansible_distribution_major_version]['path'] }}" + section: "{{ repos[ansible_distribution][ansible_distribution_major_version]['section'] }}" option: enabled value: "1" no_extra_spaces: yes vars: repos: - '8': - path: /etc/yum.repos.d/Rocky-PowerTools.repo - section: powertools - '9': - path: /etc/yum.repos.d/rocky-extras.repo - section: plus + Rocky: + '8': + path: /etc/yum.repos.d/Rocky-PowerTools.repo + section: powertools + '9': + path: /etc/yum.repos.d/rocky-extras.repo + section: plus + AlmaLinux: + '8': + path: /etc/yum.repos.d/almalinux-powertools.repo + section: powertools + '9': + path: /etc/yum.repos.d/almalinux-extras.repo + section: plus when: - openldap_servers_repo_enabled - - ansible_distribution == 'Rocky' + - ansible_distribution in ['Rocky', 'AlmaLinux'] - ansible_distribution_major_version == '8' or ansible_distribution_major_version == '9' notify: dnf makecache diff --git a/roles/system/tasks/python_pip.yml b/roles/system/tasks/python_pip.yml index fc2647e..c10526d 100644 --- a/roles/system/tasks/python_pip.yml +++ b/roles/system/tasks/python_pip.yml @@ -22,7 +22,7 @@ environment: "{{ proxy_env }}" # https://developers.redhat.com/blog/2019/05/07/what-no-python-in-red-hat-enterprise-linux-8 -- name: Set alternatives for Rocky8 +- name: Set alternatives for Rocky8 or Alma8 community.general.alternatives: name: python path: /usr/bin/python3 diff --git a/roles/system/tasks/r.yml b/roles/system/tasks/r.yml index 8ce4160..a9b3c26 100644 --- a/roles/system/tasks/r.yml +++ b/roles/system/tasks/r.yml @@ -4,17 +4,24 @@ --- - name: Ensure powertools repository is enabled community.general.ini_file: - path: "{{ repos[ansible_distribution_major_version]['path'] }}" - section: "{{ repos[ansible_distribution_major_version]['section'] }}" + path: "{{ repos[ansible_distribution][ansible_distribution_major_version]['path'] }}" + section: "{{ repos[ansible_distribution][ansible_distribution_major_version]['section'] }}" option: enabled value: "1" no_extra_spaces: yes vars: repos: - '8': - path: /etc/yum.repos.d/Rocky-PowerTools.repo - section: powertools - when: "(ansible_distribution_major_version | int) >= 8" + Rocky: + '8': + path: /etc/yum.repos.d/Rocky-PowerTools.repo + section: powertools + AlmaLinux: + '8': + path: /etc/yum.repos.d/almalinux-powertools.repo + section: powertools + when: + - ansible_distribution in ['Rocky', 'AlmaLinux'] + - (ansible_distribution_major_version | int) >= 8 - name: Install R ansible.builtin.yum: From 47b19bc740f1344ff7064d281411941186ac004b Mon Sep 17 00:00:00 2001 From: mori Date: Thu, 9 Nov 2023 09:27:23 +0100 Subject: [PATCH 2/2] fix: alma8 footnote update --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index ea96b9d..0a8a3fc 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,7 @@ ## Supported distribution - Rocky 8.6+ -- Alma[^alma] 8 - -[^alma]: Alma does not provide `openldap-servers` package so it is not supported for host in `[kdc]` Ansible group. +- Alma 8 ## Topology