Skip to content

Commit 74b6f15

Browse files
authored
Merge pull request #49 from marcelmamula/2.19
sap_software_download: Update for ansible-core 2.19
2 parents 0b3c300 + 5a22d9a commit 74b6f15

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

.github/workflows/ansible-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212

1313
- name: Ansible Lint Action
14-
uses: ansible-community/ansible-lint-action@v6.0.2
14+
uses: ansible/ansible-lint@v6

roles/sap_software_download/tasks/pre_steps/05_validate_relations.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@
7171

7272
- name: Relationship Validation - Define list of files
7373
ansible.builtin.set_fact:
74-
__sap_software_download_files: "{{ sap_software_download_files if not sap_software_download_find_alternatives
75-
else __sap_software_download_files_results_dryrun.results | selectattr('failed', 'false')| map(attribute='filename') | list | unique | d([])}}"
74+
__sap_software_download_files:
75+
"{{ sap_software_download_files
76+
if not sap_software_download_find_alternatives
77+
else __sap_software_download_files_results_dryrun.results | selectattr('failed', 'false') | map(attribute='filename') | list | unique | d([]) }}"
7678

7779

7880
- name: Relationship Validation - SAP HANA - Multiple IMDB_SERVER files found

roles/sap_software_download/vars/SLES_15.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,22 @@ __sap_software_download_python_package: >-
2525
2626
# The list of required Python Modules in packages
2727
# This is required in order to avoid externally-managed-environment error.
28-
__sap_software_download_python_module_packages: >-
29-
{%- if ansible_distribution_version.split('.')[1] | int < 5 -%}
30-
[
31-
"python3-wheel",
32-
"python3-urllib3",
33-
"python3-requests",
34-
"python3-beautifulsoup4",
35-
"python3-lxml"
36-
]
37-
{%- else -%}
38-
[
39-
"python311-wheel",
40-
"python311-urllib3",
41-
"python311-requests",
42-
"python311-beautifulsoup4",
43-
"python311-lxml"
44-
]
45-
{%- endif -%}
28+
__sap_software_download_python_module_packages:
29+
"{{ __sap_software_download_python_module_packages_3
30+
if ansible_distribution_version.split('.')[1] | int < 5
31+
else __sap_software_download_python_module_packages_311 }}"
32+
33+
# The lists of Python Modules for specific python version
34+
__sap_software_download_python_module_packages_3:
35+
- "python3-wheel"
36+
- "python3-urllib3"
37+
- "python3-requests"
38+
- "python3-beautifulsoup4"
39+
- "python3-lxml"
40+
41+
__sap_software_download_python_module_packages_311:
42+
- "python311-wheel"
43+
- "python311-urllib3"
44+
- "python311-requests"
45+
- "python311-beautifulsoup4"
46+
- "python311-lxml"

0 commit comments

Comments
 (0)