Skip to content

all: Replace inject vars with ansible_facts for 2.20 #59

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

Merged
marcelmamula merged 1 commit into from
Mar 17, 2026
Merged

all: Replace inject vars with ansible_facts for 2.20 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion docs/module_license_keys.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ Install prerequisites and create new SAP system using existing Python Virtual En
download_path: "/tmp/licenses"
register: result
environment:
PATH: "/tmp/python_venv:{{ ansible_env.PATH }}"
PATH: "/tmp/python_venv:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "/tmp/python_venv/lib/python3.11/site-packages"
VIRTUAL_ENV: "/tmp/python_venv"
vars:
Expand Down
4 changes: 2 additions & 2 deletions docs/module_maintenance_planner_files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Obtain list of SAP Software files using existing Python Virtual Environment `/tm
transaction_name: "Transaction Name or Display ID from Maintenance Planner"
register: __module_results
environment:
PATH: "/tmp/python_venv:{{ ansible_env.PATH }}"
PATH: "/tmp/python_venv:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "/tmp/python_venv/lib/python3.11/site-packages"
VIRTUAL_ENV: "/tmp/python_venv"
vars:
Expand Down Expand Up @@ -138,7 +138,7 @@ Install prerequisites and obtain list of SAP Software files using existing Pytho
transaction_name: "Transaction Name or Display ID from Maintenance Planner"
register: __module_results
environment:
PATH: "/tmp/python_venv:{{ ansible_env.PATH }}"
PATH: "/tmp/python_venv:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "/tmp/python_venv/lib/python3.11/site-packages"
VIRTUAL_ENV: "/tmp/python_venv"
vars:
Expand Down
4 changes: 2 additions & 2 deletions docs/module_maintenance_planner_stack_xml_download.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Obtain Stack file using existing Python Virtual Environment `/tmp/venv`.
dest: "Enter download path (e.g. /software)"
register: __module_results
environment:
PATH: "/tmp/venv:{{ ansible_env.PATH }}"
PATH: "/tmp/venv:{{ ansiblansible_facts['env']e_env.PATH }}"
PYTHONPATH: "/tmp/venv/lib/python3.11/site-packages"
VIRTUAL_ENV: "/tmp/venv"
vars:
Expand Down Expand Up @@ -143,7 +143,7 @@ Install prerequisites and obtain Stack file using existing Python Virtual Enviro
dest: "Enter download path (e.g. /software)"
register: __module_results
environment:
PATH: "/tmp/venv:{{ ansible_env.PATH }}"
PATH: "/tmp/venv:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "/tmp/venv/lib/python3.11/site-packages"
VIRTUAL_ENV: "/tmp/venv"
vars:
Expand Down
4 changes: 2 additions & 2 deletions docs/module_software_center_download.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Download SAP Software file using Python Virtual Environment `/tmp/venv`
search_query: "Enter SAP Software file name"
dest: "Enter download path (e.g. /software)"
environment:
PATH: "/tmp/venv:{{ ansible_env.PATH }}"
PATH: "/tmp/venv:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "/tmp/venv/lib/python3.11/site-packages"
VIRTUAL_ENV: "/tmp/venv"
vars:
Expand Down Expand Up @@ -195,7 +195,7 @@ Install prerequisites and download SAP Software file using existing Python Virtu
search_query: "Enter SAP Software file name"
dest: "Enter download path (e.g. /software)"
environment:
PATH: "/tmp/python_venv:{{ ansible_env.PATH }}"
PATH: "/tmp/python_venv:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "/tmp/python_venv/lib/python3.11/site-packages"
VIRTUAL_ENV: "/tmp/python_venv"
vars:
Expand Down
2 changes: 1 addition & 1 deletion roles/sap_software_download/tasks/download_files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
label: "{{ item }} : {{ __sap_software_download_files_results_venv.msg | d('') }}"
register: __sap_software_download_files_results_venv
environment:
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
vars:
Expand Down
2 changes: 1 addition & 1 deletion roles/sap_software_download/tasks/download_plan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
label: "{{ item.Filename }} : {{ __sap_software_download_files_plan_results_venv.msg | d('') }}"
register: __sap_software_download_files_plan_results_venv
environment:
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
vars:
Expand Down
2 changes: 1 addition & 1 deletion roles/sap_software_download/tasks/download_stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
dest: "{{ sap_software_download_directory }}"
register: __sap_software_download_stack_results_venv
environment:
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
vars:
Expand Down
12 changes: 6 additions & 6 deletions roles/sap_software_download/tasks/pre_steps/01_include_variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
loop: "{{ __var_files }}"
vars:
__vars_file: "{{ role_path }}/vars/{{ item }}"
__distribution_major: "{{ ansible_distribution ~ '_' ~ ansible_distribution_major_version }}"
__distribution_minor: "{{ ansible_distribution ~ '_' ~ ansible_distribution_version }}"
__distribution_major: "{{ ansible_facts['distribution'] ~ '_' ~ ansible_facts['distribution_major_version'] }}"
__distribution_minor: "{{ ansible_facts['distribution'] ~ '_' ~ ansible_facts['distribution_version'] }}"
# Enables loading of shared vars between SLES and SLES_SAP
__distribution_major_split: "{{ ansible_distribution.split('_')[0] ~ '_' ~ ansible_distribution_major_version }}"
__distribution_minor_split: "{{ ansible_distribution.split('_')[0] ~ '_' ~ ansible_distribution_version }}"
__distribution_major_split: "{{ ansible_facts['distribution'].split('_')[0] ~ '_' ~ ansible_facts['distribution_major_version'] }}"
__distribution_minor_split: "{{ ansible_facts['distribution'].split('_')[0] ~ '_' ~ ansible_facts['distribution_version'] }}"
__var_files: >-
{{
[
ansible_os_family ~ '.yml',
(ansible_distribution ~ '.yml') if ansible_distribution != ansible_os_family else None,
ansible_facts['os_family'] ~ '.yml',
(ansible_facts['distribution'] ~ '.yml') if ansible_facts['distribution'] != ansible_facts['os_family'] else None,
(__distribution_major_split ~ '.yml') if __distribution_major_split != __distribution_major else None,
(__distribution_minor_split ~ '.yml') if __distribution_minor_split != __distribution_minor else None,
__distribution_major ~ '.yml',
Expand Down
2 changes: 1 addition & 1 deletion roles/sap_software_download/tasks/pre_steps/03_validate_credentials.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
retries: 1
delay: 5
environment:
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
vars:
Expand Down
2 changes: 1 addition & 1 deletion roles/sap_software_download/tasks/pre_steps/04_get_plan_files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
register: __sap_software_download_mp_transaction_results_venv
retries: 1
environment:
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
vars:
Expand Down
2 changes: 1 addition & 1 deletion roles/sap_software_download/tasks/pre_steps/05_validate_relations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
retries: 1
until: __sap_software_download_files_results_dryrun_venv is not failed
environment:
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
vars:
Expand Down
6 changes: 3 additions & 3 deletions roles/sap_software_download/vars/SLES_15.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
# Set which Python version will be used on destination node.
# This is python executable name, which can differ from python package name.
__sap_software_download_python_interpreter: >-
{%- if ansible_distribution_version.split('.')[1] | int < 5 -%}
{%- if ansible_facts['distribution_version'].split('.')[1] | int < 5 -%}
python3
{%- else -%}
python3.11
{%- endif -%}

# Set which Python package will be installed on destination node.
__sap_software_download_python_package: >-
{%- if ansible_distribution_version.split('.')[1] | int < 5 -%}
{%- if ansible_facts['distribution_version'].split('.')[1] | int < 5 -%}
python3
{%- else -%}
python311
Expand All @@ -27,7 +27,7 @@ __sap_software_download_python_package: >-
# This is required in order to avoid externally-managed-environment error.
__sap_software_download_python_module_packages:
"{{ __sap_software_download_python_module_packages_3
if ansible_distribution_version.split('.')[1] | int < 5
if ansible_facts['distribution_version'].split('.')[1] | int < 5
else __sap_software_download_python_module_packages_311 }}"

# The lists of Python Modules for specific python version
Expand Down
Loading