Skip to content

Commit a986832

Browse files
committed
fix: ansible-lint corrections
1 parent 2631c71 commit a986832

File tree

11 files changed

+31
-30
lines changed

11 files changed

+31
-30
lines changed

.ansible-lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ exclude_paths:
55
- .ansible/
66
- .cache/
77
- .github/
8-
#- docs/
8+
# - docs/
99
- changelogs/
1010
- playbooks/
1111
- tests/

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ __pycache__/
5252
# VSCode
5353
.vscode
5454

55+
.ansible

roles/sap_software_download/defaults/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ sap_software_download_use_venv: true
3333
# The SAP S-User ID with download authorization for SAP software.
3434
sap_software_download_suser_id: ''
3535

36-
# The password for the SAP S-User specified in `sap_software_download_suser_id`.
36+
# The password for the SAP S-User specified in `sap_software_download_suser_id`.
3737
sap_software_download_suser_password: ''
3838

3939
# A list of SAP software file names to download.
@@ -44,19 +44,13 @@ sap_software_download_files: []
4444
sap_software_download_mp_transaction: ''
4545

4646
# Enables searching for alternative files if the requested file is not found.
47-
# Only applies to files specified in `sap_software_download_files`.
47+
# Only applies to files specified in `sap_software_download_files`.
4848
# If set to `false`, the role will not search for alternatives.
4949
sap_software_download_find_alternatives: true
5050

5151
# The directory where downloaded SAP software files will be stored.
5252
sap_software_download_directory: '/software'
5353

54-
# Enables validation of relationships between SAP software files.
55-
# Only applies to files specified in `sap_software_download_files`.
56-
# If set to `false`, no relationship validation will be performed.
57-
# Example: Verify version of IMDB_LCAPPS against IMDB_SERVER if IMDB_SERVER was found.
58-
sap_software_download_validate_relationships: true
59-
6054
# Determines whether to ignore errors when a requested file is not found.
6155
# If set to `true`, the role will continue execution and download other files, even if some files are not found.
6256
# If set to `false`, the role will fail if any requested file is not found.
@@ -68,6 +62,12 @@ sap_software_download_ignore_file_not_found: false
6862
# If set to `false`, the role will fail if the specified Maintenance Plan is not found.
6963
sap_software_download_ignore_plan_not_found: false
7064

65+
# Enables validation of relationships between SAP software files.
66+
# Only applies to files specified in `sap_software_download_files`.
67+
# If set to `false`, no relationship validation will be performed.
68+
# Example: Verify version of IMDB_LCAPPS against IMDB_SERVER if IMDB_SERVER was found.
69+
sap_software_download_validate_relationships: true
70+
7171
# Determines whether to ignore warnings during file relationship validation.
7272
# If set to `true`, the role will continue execution even if there are warnings during the validation of file relationships.
7373
# If set to `false`, the role will fail if any warnings are encountered during file relationship validation.

roles/sap_software_download/meta/argument_spec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ argument_specs:
6464
required: true
6565
no_log: true
6666
description:
67-
- The password for the SAP S-User specified in `sap_software_download_suser_id`.
67+
- The password for the SAP S-User specified in `sap_software_download_suser_id`.
6868

6969
sap_software_download_files:
7070
type: list
@@ -88,7 +88,7 @@ argument_specs:
8888
default: true
8989
description:
9090
- Enables searching for alternative files if the requested file is not found.
91-
- Only applies to files specified in `sap_software_download_files`.
91+
- Only applies to files specified in `sap_software_download_files`.
9292
- If set to `false`, the role will not search for alternatives.
9393

9494
sap_software_download_directory:

roles/sap_software_download/tasks/download_files.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
retries: 1
1818
until: __sap_software_download_files_results_venv is not failed
1919
environment:
20-
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
21-
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
22-
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
20+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
21+
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
22+
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
2323
vars:
2424
ansible_python_interpreter: "{{ __sap_software_download_venv.path ~ '/bin/' ~ sap_software_download_python_interpreter }}"
2525
ignore_errors: true # Errors are ignored and validated afterwards

roles/sap_software_download/tasks/download_plan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
retries: 1
1717
until: __sap_software_download_files_plan_results_venv is not failed
1818
environment:
19-
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
20-
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
21-
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
19+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
20+
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
21+
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
2222
vars:
2323
ansible_python_interpreter: "{{ __sap_software_download_venv.path ~ '/bin/' ~ sap_software_download_python_interpreter }}"
2424
ignore_errors: true # Errors are ignored and validated afterwards

roles/sap_software_download/tasks/pre_steps/01_include_variables.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
- sap_software_download_python_package | length > 0
7575
fail_msg: |
7676
Empty variable `sap_software_download_python_package`.
77-
Ensure that it contains correct Python package name or revert back to defaults.
77+
Ensure that it contains correct Python package name or revert back to defaults.
7878
7979
- name: "Pre-Steps - Verify variable: sap_software_download_python_module_packages"
8080
ansible.builtin.assert:
@@ -84,7 +84,7 @@
8484
- sap_software_download_python_module_packages | length > 0
8585
fail_msg: |
8686
Empty variable `sap_software_download_python_module_packages`.
87-
Ensure that it contains correct list of Python module package names or revert back to defaults.
87+
Ensure that it contains correct list of Python module package names or revert back to defaults.
8888
8989
- name: "Pre-Steps - Verify variable: sap_software_download_suser_id"
9090
ansible.builtin.assert:
@@ -93,7 +93,7 @@
9393
- sap_software_download_suser_id | length > 0
9494
fail_msg: |
9595
Empty variable `sap_software_download_suser_id`.
96-
Enter valid S-User ID with download authorizations.
96+
Enter valid S-User ID with download authorizations.
9797
9898
- name: "Pre-Steps - Verify variable: sap_software_download_suser_password"
9999
ansible.builtin.assert:

roles/sap_software_download/tasks/pre_steps/03_validate_credentials.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
retries: 1
1717
delay: 5
1818
environment:
19-
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
20-
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
21-
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
19+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
20+
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
21+
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
2222
vars:
2323
ansible_python_interpreter: "{{ __sap_software_download_venv.path ~ '/bin/' ~ sap_software_download_python_interpreter }}"
2424
ignore_errors: true # Errors are ignored and validated afterwards

roles/sap_software_download/tasks/pre_steps/04_get_plan_files.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
register: __sap_software_download_mp_transaction_results_venv
1111
retries: 1
1212
environment:
13-
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
14-
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
15-
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
13+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
14+
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
15+
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
1616
vars:
1717
ansible_python_interpreter: "{{ __sap_software_download_venv.path ~ '/bin/' ~ sap_software_download_python_interpreter }}"
1818
changed_when: false # Getting list of files does not change anything

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
retries: 1
2323
until: __sap_software_download_files_results_dryrun_venv is not failed
2424
environment:
25-
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
26-
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
27-
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
25+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
26+
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
27+
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
2828
vars:
2929
ansible_python_interpreter: "{{ __sap_software_download_venv.path ~ '/bin/' ~ sap_software_download_python_interpreter }}"
3030
ignore_errors: true # Errors are ignored and validated afterwards

0 commit comments

Comments
 (0)