Merge pull request sap-linuxlab#732 from berndfinger/issue-729

sap_install_media_detect: Allow detection of SAPEXE only
berndfinger · Jun 4, 2024 · 54aa486 · 54aa486
2 parents 4cf9c7e + e97e6f0
commit 54aa486
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/roles/sap_install_media_detect/tasks/find_files_after_extraction.yml b/roles/sap_install_media_detect/tasks/find_files_after_extraction.yml
@@ -147,8 +147,11 @@
 - name: SAP Install Media Detect - Find files after extraction - Find SAPEXEDB, database specific - block
   when:
     - sap_install_media_detect_kernel
-    - sap_install_media_detect_kernel_db is defined
-    - sap_install_media_detect_kernel_db | length > 0
+    - sap_install_media_detect_kernel_db == 'saphana' or
+      sap_install_media_detect_kernel_db == 'sapase' or
+      sap_install_media_detect_kernel_db == 'sapmaxdb' or
+      sap_install_media_detect_kernel_db == 'oracledb' or
+      sap_install_media_detect_kernel_db == 'ibmdb2'
   block:
 
     - name: SAP Install Media Detect - Find files after extraction - Find SAPEXEDB, database specific

diff --git a/roles/sap_install_media_detect/tasks/prepare/create_file_list_phase_2.yml b/roles/sap_install_media_detect/tasks/prepare/create_file_list_phase_2.yml
@@ -136,7 +136,12 @@
         - sap_install_media_detect_kernel_db is not defined
 
     - name: SAP Install Media Detect - Prepare - Assert that exactly one matching SAP Kernel DB dependent is present
-      when: sap_install_media_detect_kernel_db is defined
+      when:
+        sap_install_media_detect_kernel_db == 'saphana' or
+        sap_install_media_detect_kernel_db == 'sapase' or
+        sap_install_media_detect_kernel_db == 'sapmaxdb' or
+        sap_install_media_detect_kernel_db == 'oracledb' or
+        sap_install_media_detect_kernel_db == 'ibmdb2'
       block:
 
         - name: SAP Install Media Detect - Prepare - Assert that exactly one SAP Kernel DB dependent for SAP HANA is present

diff --git a/roles/sap_install_media_detect/tasks/set_global_vars.yml b/roles/sap_install_media_detect/tasks/set_global_vars.yml
@@ -135,6 +135,7 @@
     - sap_install_media_detect_kernel
     - sap_install_media_detect_kernel_db is defined
     - sap_install_media_detect_kernel_db | length > 0
+    - sap_install_media_detect_kernel_db != 'none'
 
 - name: SAP Install Media Detect - Detection completed - Set facts for SAP IGS
   ansible.builtin.set_fact: