Skip to content

Commit

Permalink
feat: Add new minor version across distribution
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelmamula committed Oct 11, 2024
1 parent 384f4d8 commit a927ec5
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 13 deletions.
10 changes: 6 additions & 4 deletions roles/sap_hana_preconfigure/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@

# Load variable file starting with actual version up to OS family.
# Example for SUSE Linux Enterprise Server for SAP Applications 15 SP6:
# 1. SLES_SAP_15.6.yml
# 2. SLES_SAP_15.yml
# 3. SLES_15.yml
# 4. Suse.yml
# 1. SLES_SAP_15.6.yml - Specific to distribution with major and minor release.
# 2. SLES_SAP_15.yml - Specific to distribution and major release regardless of minor release.
# 3. SLES_15.6.yml - Specific to distribution family (SLES and SLES4SAP) and minor release.
# 4. SLES_15.yml - Specific to distribution.
# 5. Suse.yml - Specific to OS family.
- name: Include OS specific vars
ansible.builtin.include_vars: '{{ item }}'
with_first_found:
- '{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml'
- '{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml'
- '{{ ansible_distribution.split("_")[0] }}_{{ ansible_distribution_version }}.yml'
- '{{ ansible_distribution.split("_")[0] }}_{{ ansible_distribution_major_version }}.yml'
- '{{ ansible_os_family }}.yml'

Expand Down
5 changes: 3 additions & 2 deletions roles/sap_hana_preconfigure/vars/SLES_15.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# SPDX-License-Identifier: Apache-2.0
---

# required SAP Notes for SLES 15
# Variables specific to following versions:
# - SUSE Linux Enterprise Server for SAP Applications 15
# - SUSE Linux Enterprise Server 15

__sap_hana_preconfigure_sapnotes:
# - "{% if ansible_architecture == 'ppc64le' %}2055470{% endif %}"
Expand Down
10 changes: 6 additions & 4 deletions roles/sap_netweaver_preconfigure/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@

# Load variable file starting with actual version up to OS family.
# Example for SUSE Linux Enterprise Server for SAP Applications 15 SP6:
# 1. SLES_SAP_15.6.yml
# 2. SLES_SAP_15.yml
# 3. SLES_15.yml
# 4. Suse.yml
# 1. SLES_SAP_15.6.yml - Specific to distribution with major and minor release.
# 2. SLES_SAP_15.yml - Specific to distribution and major release regardless of minor release.
# 3. SLES_15.6.yml - Specific to distribution family (SLES and SLES4SAP) and minor release.
# 4. SLES_15.yml - Specific to distribution.
# 5. Suse.yml - Specific to OS family.
- name: Include OS specific vars
ansible.builtin.include_vars: '{{ item }}'
with_first_found:
- '{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml'
- '{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml'
- '{{ ansible_distribution.split("_")[0] }}_{{ ansible_distribution_version }}.yml'
- '{{ ansible_distribution.split("_")[0] }}_{{ ansible_distribution_major_version }}.yml'
- '{{ ansible_os_family }}.yml'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: Apache-2.0
---
# required SAP Notes for SLES 15
# Variables specific to following versions:
# - SUSE Linux Enterprise Server for SAP Applications 15 SP6
# - SUSE Linux Enterprise Server 15 SP6

__sap_netweaver_preconfigure_sapnotes:
- "1275776"
Expand All @@ -13,7 +15,7 @@ __sap_netweaver_preconfigure_packages:
- insserv-compat
- cpupower
- hicolor-icon-theme
- libcpupower1
- libcpupower1 # libcpupower0 was removed in SP6
- libsensors4
- patterns-base-basesystem
- patterns-server-enterprise-sap_server
Expand Down
4 changes: 3 additions & 1 deletion roles/sap_netweaver_preconfigure/vars/SLES_15.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: Apache-2.0
---
# required SAP Notes for SLES 15
# Variables specific to following versions:
# - SUSE Linux Enterprise Server for SAP Applications 15
# - SUSE Linux Enterprise Server 15

__sap_netweaver_preconfigure_sapnotes:
- "1275776"
Expand Down

0 comments on commit a927ec5

Please sign in to comment.