Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enterprise Linux 8 package installation simplification #221

Merged
merged 2 commits into from
Apr 3, 2025
Merged

Enterprise Linux 8 package installation simplification #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d596881
Enterprise Linux 8 package installation simplification
simonpane Mar 7, 2025
18dcc14
Moved RHEL7 package manager and repo commands into dedicated block
simonpane Mar 28, 2025
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
3 changes: 0 additions & 3 deletions roles/ora-host/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ firewall_service: "{% if ansible_distribution_major_version | int == 6 %}iptable
package_repository_files:
- "redhat.repo"
- "rh-cloud.repo"
- "oracle-linux-ol7.repo"
- "oracle-linux-ol8.repo"
- "oracle-linux-ol9.repo"

oracle_required_rpms:
- bc
Expand Down
111 changes: 50 additions & 61 deletions roles/ora-host/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
list: "{{ firewall_service }}"
disablerepo: "*"
lock_timeout: "{{ pkg_mgr_lock_timeout }}"
when: disable_firewall|bool and ansible_os_family == 'RedHat'
when:
- disable_firewall | bool
- ansible_os_family == 'RedHat'
tags: firewall
register: firewall

Expand All @@ -27,19 +29,27 @@
name: "{{ firewall_service }}"
state: stopped
enabled: false
when: disable_firewall|bool and ansible_os_family == 'RedHat' and firewall.results
when:
- disable_firewall | bool
- ansible_os_family == 'RedHat'
- firewall.results
tags: firewall

- name: Disable selinux (permanently)
selinux:
state: disabled
when: disable_selinux and ansible_os_family == 'RedHat'
when:
- disable_selinux
- ansible_os_family == 'RedHat'
tags: selinux
register: selinux

- name: Disable selinux (runtime)
command: setenforce 0
when: disable_selinux and ansible_os_family == 'RedHat' and ansible_selinux.status != 'disabled'
when:
- disable_selinux
- ansible_os_family == 'RedHat'
- ansible_selinux.status != 'disabled'
changed_when: disable_selinux_runtime.rc == 0
failed_when: disable_selinux_runtime.rc > 0 and "SELinux is disabled" not in disable_selinux_runtime.stderr
register: disable_selinux_runtime
Expand All @@ -59,73 +69,52 @@
opts: rw,nosuid,nodev
state: mounted

- name: Check for existing package manager repo files
stat:
path: "/etc/yum.repos.d/{{ item }}"
register: repo_file_check
with_items: "{{ package_repository_files }}"
tags: os-packages

- name: Build a list of detected package manager repo files
set_fact:
repo_files: "{{ repo_file_check.results | selectattr('stat.exists') | map(attribute='item') | list }}"
tags: os-packages

- name: List all detected package manager repo files
debug:
var: repo_files
verbosity: 1
tags: os-packages

- name: Install Oracle required packages (RHUI/cloud config) for RHEL7
package:
name: "{{ oracle_required_rpms + oracle_required_rpms_el7 }}"
state: present
lock_timeout: "{{ pkg_mgr_lock_timeout }}"
enablerepo: rhui-rhel-7-server-rhui-optional-rpms
- name: Enterprise Linux 7 specific package manager steps
when:
- install_os_packages
- ansible_distribution == 'RedHat'
- ansible_distribution_major_version == '7'
- "'rh-cloud.repo' in repo_files"
- ansible_distribution_major_version | int == 7
tags: os-packages

- name: Install Oracle required packages (base/non-RHUI config) for RHEL7
package:
name: "{{ oracle_required_rpms + oracle_required_rpms_el7 }}"
state: present
lock_timeout: "{{ pkg_mgr_lock_timeout }}"
enablerepo: rhel-7-server-optional-rpms
when:
- install_os_packages
- ansible_distribution == 'RedHat'
- ansible_distribution_major_version == '7'
- "'redhat.repo' in repo_files and 'rh-cloud.repo' not in repo_files"
tags: os-packages

- name: Install Oracle required packages for RHEL8+
package:
name: "{{ oracle_required_rpms + vars['oracle_required_rpms_el' + ansible_distribution_major_version] }}"
state: present
lock_timeout: "{{ pkg_mgr_lock_timeout }}"
loop: "{{ repo_files }}"
when:
- install_os_packages
- ansible_distribution == 'RedHat'
- ansible_distribution_major_version >= '8'
- "'redhat.repo' in repo_files or 'rh-cloud.repo' in repo_files"
tags: os-packages

- name: Install Oracle required packages for Oracle Linux
block:
- name: Check for existing package manager repo files
stat:
path: "/etc/yum.repos.d/{{ item }}"
register: repo_file_check
with_items: "{{ package_repository_files }}"

- name: Build a list of detected package manager repo files
set_fact:
repo_files: "{{ repo_file_check.results | selectattr('stat.exists') | map(attribute='item') | list }}"

- name: List all detected package manager repo files
debug:
var: repo_files
verbosity: 1

- name: Install Oracle required packages (RHUI/cloud config) for RHEL7
package:
name: "{{ oracle_required_rpms + oracle_required_rpms_el7 }}"
state: present
lock_timeout: "{{ pkg_mgr_lock_timeout }}"
enablerepo: rhui-rhel-7-server-rhui-optional-rpms
when: "'rh-cloud.repo' in repo_files"

- name: Install Oracle required packages (base/non-RHUI config) for RHEL7
package:
name: "{{ oracle_required_rpms + oracle_required_rpms_el7 }}"
state: present
lock_timeout: "{{ pkg_mgr_lock_timeout }}"
enablerepo: rhel-7-server-optional-rpms
when: "'redhat.repo' in repo_files and 'rh-cloud.repo' not in repo_files"

- name: Install Oracle required packages
package:
name: "{{ oracle_required_rpms + vars['oracle_required_rpms_el' + ansible_distribution_major_version] }}"
state: present
lock_timeout: "{{ pkg_mgr_lock_timeout }}"
loop: "{{ repo_files }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we now only use repo_files for RHEL7, should we skip the steps to calculate it in non-RHEL7 cases? Maybe even a block?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's a very good suggestion @mfielding . Have implemented as you suggested in commit 18dcc14 - moved all RHEL7 specific steps into a dedicated block.

Re-tested against all major versions with results shown in:

when:
- install_os_packages
- ansible_distribution == 'OracleLinux'
- "('oracle-linux-ol' ~ ansible_distribution_major_version ~ '.repo') in item"
- not (ansible_distribution == 'RedHat' and ansible_distribution_major_version | int == 7)
tags: os-packages

- name: Add OS groups
Expand Down