Skip to content

Commit b1c6c95

Browse files
marcelmamulamarcelmamula
committed
replace inject vars with ansible_facts for 2.20
1 parent beddec9 commit b1c6c95

12 files changed

Lines changed: 22 additions & 22 deletions

‎docs/module_license_keys.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Install prerequisites and create new SAP system using existing Python Virtual En
230230
download_path: "/tmp/licenses"
231231
register: result
232232
environment:
233-
PATH: "/tmp/python_venv:{{ ansible_env.PATH }}"
233+
PATH: "/tmp/python_venv:{{ ansible_facts['env'].PATH }}"
234234
PYTHONPATH: "/tmp/python_venv/lib/python3.11/site-packages"
235235
VIRTUAL_ENV: "/tmp/python_venv"
236236
vars:

‎docs/module_maintenance_planner_files.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Obtain list of SAP Software files using existing Python Virtual Environment `/tm
6868
transaction_name: "Transaction Name or Display ID from Maintenance Planner"
6969
register: __module_results
7070
environment:
71-
PATH: "/tmp/python_venv:{{ ansible_env.PATH }}"
71+
PATH: "/tmp/python_venv:{{ ansible_facts['env'].PATH }}"
7272
PYTHONPATH: "/tmp/python_venv/lib/python3.11/site-packages"
7373
VIRTUAL_ENV: "/tmp/python_venv"
7474
vars:
@@ -138,7 +138,7 @@ Install prerequisites and obtain list of SAP Software files using existing Pytho
138138
transaction_name: "Transaction Name or Display ID from Maintenance Planner"
139139
register: __module_results
140140
environment:
141-
PATH: "/tmp/python_venv:{{ ansible_env.PATH }}"
141+
PATH: "/tmp/python_venv:{{ ansible_facts['env'].PATH }}"
142142
PYTHONPATH: "/tmp/python_venv/lib/python3.11/site-packages"
143143
VIRTUAL_ENV: "/tmp/python_venv"
144144
vars:

‎docs/module_maintenance_planner_stack_xml_download.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Obtain Stack file using existing Python Virtual Environment `/tmp/venv`.
7171
dest: "Enter download path (e.g. /software)"
7272
register: __module_results
7373
environment:
74-
PATH: "/tmp/venv:{{ ansible_env.PATH }}"
74+
PATH: "/tmp/venv:{{ ansiblansible_facts['env']e_env.PATH }}"
7575
PYTHONPATH: "/tmp/venv/lib/python3.11/site-packages"
7676
VIRTUAL_ENV: "/tmp/venv"
7777
vars:
@@ -143,7 +143,7 @@ Install prerequisites and obtain Stack file using existing Python Virtual Enviro
143143
dest: "Enter download path (e.g. /software)"
144144
register: __module_results
145145
environment:
146-
PATH: "/tmp/venv:{{ ansible_env.PATH }}"
146+
PATH: "/tmp/venv:{{ ansible_facts['env'].PATH }}"
147147
PYTHONPATH: "/tmp/venv/lib/python3.11/site-packages"
148148
VIRTUAL_ENV: "/tmp/venv"
149149
vars:

‎docs/module_software_center_download.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Download SAP Software file using Python Virtual Environment `/tmp/venv`
125125
search_query: "Enter SAP Software file name"
126126
dest: "Enter download path (e.g. /software)"
127127
environment:
128-
PATH: "/tmp/venv:{{ ansible_env.PATH }}"
128+
PATH: "/tmp/venv:{{ ansible_facts['env'].PATH }}"
129129
PYTHONPATH: "/tmp/venv/lib/python3.11/site-packages"
130130
VIRTUAL_ENV: "/tmp/venv"
131131
vars:
@@ -195,7 +195,7 @@ Install prerequisites and download SAP Software file using existing Python Virtu
195195
search_query: "Enter SAP Software file name"
196196
dest: "Enter download path (e.g. /software)"
197197
environment:
198-
PATH: "/tmp/python_venv:{{ ansible_env.PATH }}"
198+
PATH: "/tmp/python_venv:{{ ansible_facts['env'].PATH }}"
199199
PYTHONPATH: "/tmp/python_venv/lib/python3.11/site-packages"
200200
VIRTUAL_ENV: "/tmp/python_venv"
201201
vars:

‎roles/sap_software_download/tasks/download_files.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
label: "{{ item }} : {{ __sap_software_download_files_results_venv.msg | d('') }}"
1717
register: __sap_software_download_files_results_venv
1818
environment:
19-
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
19+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
2020
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
2121
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
2222
vars:

‎roles/sap_software_download/tasks/download_plan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
label: "{{ item.Filename }} : {{ __sap_software_download_files_plan_results_venv.msg | d('') }}"
1616
register: __sap_software_download_files_plan_results_venv
1717
environment:
18-
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
18+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
1919
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
2020
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
2121
vars:

‎roles/sap_software_download/tasks/download_stack.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
dest: "{{ sap_software_download_directory }}"
1111
register: __sap_software_download_stack_results_venv
1212
environment:
13-
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
13+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
1414
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
1515
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
1616
vars:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
loop: "{{ __var_files }}"
1313
vars:
1414
__vars_file: "{{ role_path }}/vars/{{ item }}"
15-
__distribution_major: "{{ ansible_distribution ~ '_' ~ ansible_distribution_major_version }}"
16-
__distribution_minor: "{{ ansible_distribution ~ '_' ~ ansible_distribution_version }}"
15+
__distribution_major: "{{ ansible_facts['distribution'] ~ '_' ~ ansible_facts['distribution_major_version'] }}"
16+
__distribution_minor: "{{ ansible_facts['distribution'] ~ '_' ~ ansible_facts['distribution_version'] }}"
1717
# Enables loading of shared vars between SLES and SLES_SAP
18-
__distribution_major_split: "{{ ansible_distribution.split('_')[0] ~ '_' ~ ansible_distribution_major_version }}"
19-
__distribution_minor_split: "{{ ansible_distribution.split('_')[0] ~ '_' ~ ansible_distribution_version }}"
18+
__distribution_major_split: "{{ ansible_facts['distribution'].split('_')[0] ~ '_' ~ ansible_facts['distribution_major_version'] }}"
19+
__distribution_minor_split: "{{ ansible_facts['distribution'].split('_')[0] ~ '_' ~ ansible_facts['distribution_version'] }}"
2020
__var_files: >-
2121
{{
2222
[
23-
ansible_os_family ~ '.yml',
24-
(ansible_distribution ~ '.yml') if ansible_distribution != ansible_os_family else None,
23+
ansible_facts['os_family'] ~ '.yml',
24+
(ansible_facts['distribution'] ~ '.yml') if ansible_facts['distribution'] != ansible_facts['os_family'] else None,
2525
(__distribution_major_split ~ '.yml') if __distribution_major_split != __distribution_major else None,
2626
(__distribution_minor_split ~ '.yml') if __distribution_minor_split != __distribution_minor else None,
2727
__distribution_major ~ '.yml',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
retries: 1
1717
delay: 5
1818
environment:
19-
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_env.PATH }}"
19+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
2020
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
2121
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
2222
vars:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
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 }}"
13+
PATH: "{{ __sap_software_download_venv.path }}/bin:{{ ansible_facts['env'].PATH }}"
1414
PYTHONPATH: "{{ __sap_software_download_venv.path }}/lib/{{ sap_software_download_python_interpreter }}/site-packages"
1515
VIRTUAL_ENV: "{{ __sap_software_download_venv.path }}"
1616
vars:

0 commit comments

Comments
 (0)