Skip to content

Commit

Permalink
sap_install_media_detect: support database client only assertions
Browse files Browse the repository at this point in the history
  • Loading branch information
berndfinger committed Sep 20, 2023
1 parent 586361c commit a153398
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 2 additions & 0 deletions roles/sap_install_media_detect/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ sap_install_media_detect_assert_after_sapfile: true

# Typical parameter settings for SAP S/4HANA:
sap_install_media_detect_db: 'saphana' # saphana, sapase, sapmaxdb, oracledb, ibmdb2
sap_install_media_detect_db_client: 'saphana' # saphana, sapase, sapmaxdb, oracledb, ibmdb2
sap_install_media_detect_swpm: true
sap_install_media_detect_hostagent: true
sap_install_media_detect_igs: true
Expand All @@ -79,6 +80,7 @@ sap_install_media_detect_export: 'saps4hana' # saps4hana, sapbw4hana, sapecc, s

# Typical parameter settings for SAP ERP 6.0 EHP8 with SAP HANA database:
#sap_install_media_detect_db: 'saphana' # saphana, sapase, sapmaxdb, oracledb, ibmdb2
#sap_install_media_detect_db_client: 'saphana' # saphana, sapase, sapmaxdb, oracledb, ibmdb2
#sap_install_media_detect_swpm: true
#sap_install_media_detect_hostagent: true
#sap_install_media_detect_igs: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@
- __sap_install_media_detect_fact_files_sapfile_results | selectattr('sap_file_type', 'equalto', 'saphana_client') | length > 0
fail_msg: "No file found for saphana_client"
when:
- (sap_install_media_detect_db | d('')) == 'saphana'
- (sap_install_media_detect_db | d('')) == 'saphana' or
(sap_install_media_detect_db_client | d('')) == 'saphana'

- name: SAP Install Media Detect - Prepare - Assert that sapase is present
ansible.builtin.assert:
Expand All @@ -235,7 +236,8 @@
- __sap_install_media_detect_fact_files_sapfile_results | selectattr('sap_file_type', 'equalto', 'sapase_client') | length > 0
fail_msg: "No file found for sapase_client"
when:
- (sap_install_media_detect_db | d('')) == 'sapase'
- (sap_install_media_detect_db | d('')) == 'sapase' or
(sap_install_media_detect_db_client | d('')) == 'sapase'

- name: SAP Install Media Detect - Prepare - Assert that sapmaxdb is present
ansible.builtin.assert:
Expand All @@ -259,7 +261,8 @@
- __sap_install_media_detect_fact_files_sapfile_results | selectattr('sap_file_type', 'equalto', 'oracledb_client') | length > 0
fail_msg: "No file found for oracledb_client"
when:
- (sap_install_media_detect_db | d('')) == 'oracledb'
- (sap_install_media_detect_db | d('')) == 'oracledb' or
(sap_install_media_detect_db_client | d('')) == 'oracledb'

- name: SAP Install Media Detect - Prepare - Assert that ibmdb2 is present
ansible.builtin.assert:
Expand All @@ -275,7 +278,8 @@
- __sap_install_media_detect_fact_files_sapfile_results | selectattr('sap_file_type', 'equalto', 'ibmdb2_client') | length > 0
fail_msg: "No file found for ibmdb2_client"
when:
- (sap_install_media_detect_db | d('')) == 'ibmdb2'
- (sap_install_media_detect_db | d('')) == 'ibmdb2' or
(sap_install_media_detect_db_client | d('')) == 'ibmdb2'

- name: SAP Install Media Detect - Prepare - Assert that ibmdb2_license is present
ansible.builtin.assert:
Expand Down

0 comments on commit a153398

Please sign in to comment.