Merge pull request sap-linuxlab#1125 from marcelmamula/swpm_sapcar

sap_swm: Enhance detection of multiple files

Author: marcelmamula

roles/sap_swpm/README.md

@@ -675,61 +675,6 @@ Define to limit number of parallel extraction SAP HANA jobs.
 
 Define password for Diagnostic Agent.
 
-#### sap_swpm_igs_path
-- _Type:_ `string`
-- _Default:_ `{{ sap_swpm_software_path }}`
-
-Define individual path for SAP IGS file. `sap_swpm_software_path` is used by default.
-
-#### sap_swpm_igs_file_name
-- _Type:_ `string`
-
-Define individual name of SAP IGS file. Newest file is auto-detected in `sap_swpm_igs_path`.
-
-#### sap_swpm_igs_helper_path
-- _Type:_ `string`
-- _Default:_ `{{ sap_swpm_software_path }}`
-
-Define individual path for SAP IGS Helper file. `sap_swpm_software_path` is used by default.
-
-#### sap_swpm_igs_helper_file_name
-- _Type:_ `string`
-
-Define individual name of SAP IGS Helper file. Newest file is auto-detected in `sap_swpm_igs_helper_path`.
-
-#### sap_swpm_kernel_dependent_path
-- _Type:_ `string`
-- _Default:_ `{{ sap_swpm_software_path }}`
-
-Define individual path for Database dependent kernel files. `sap_swpm_software_path` is used by default.
-
-#### sap_swpm_kernel_dependent_file_name
-- _Type:_ `string`
-
-Define individual name of Database dependent kernel file. Newest file is auto-detected in `sap_swpm_kernel_dependent_path`.
-
-#### sap_swpm_kernel_independent_path
-- _Type:_ `string`
-- _Default:_ `{{ sap_swpm_software_path }}`
-
-Define individual path for Database independent kernel files. `sap_swpm_software_path` is used by default.
-
-#### sap_swpm_kernel_independent_file_name
-- _Type:_ `string`
-
-Define individual name of Database independent kernel file. Newest file is auto-detected in `sap_swpm_kernel_independent_path`.
-
-#### sap_swpm_web_dispatcher_path
-- _Type:_ `string`
-- _Default:_ `{{ sap_swpm_software_path }}`
-
-Define individual path for SAP Web Dispatcher files. `sap_swpm_software_path` is used by default.
-
-#### sap_swpm_web_dispatcher_file_name
-- _Type:_ `string`
-
-Define individual name of SAP Web Dispatcher file. Newest file is auto-detected in `sap_swpm_web_dispatcher_path`.
-
 #### sap_swpm_fqdn
 - _Type:_ `string`
 

roles/sap_swpm/defaults/main.yml

@@ -407,21 +407,6 @@ sap_swpm_parallel_jobs_nr: '23'
 
 sap_swpm_diagnostics_agent_password: ''
 
-
-## --- Individual Software Paths --- ##
-# will follow sap_swpm_software_path
-# alternatively, can be detected and set with sap_install_media_detect Ansible Role
-
-sap_swpm_igs_path: ''
-sap_swpm_igs_file_name: ''
-sap_swpm_igs_helper_path: ''
-sap_swpm_igs_helper_file_name: ''
-sap_swpm_kernel_dependent_path: ''
-sap_swpm_kernel_dependent_file_name: ''
-sap_swpm_kernel_independent_path: ''
-sap_swpm_kernel_independent_file_name: ''
-sap_swpm_web_dispatcher_path: ''
-sap_swpm_web_dispatcher_file_name: ''
 sap_swpm_fqdn: ''
 sap_swpm_set_fqdn: true
 

roles/sap_swpm/tasks/pre_install.yml

@@ -325,16 +325,25 @@
 
 - name: SAP SWPM - Display Software
   ansible.builtin.debug:
-    msg:
-      - " SAPEXEDB   -   {{ sap_swpm_kernel_dependent_path }}/{{ sap_swpm_kernel_dependent_file_name }} "
-      - " SAPEXE     -   {{ sap_swpm_kernel_independent_path }}/{{ sap_swpm_kernel_independent_file_name }} "
-      - " IGS Helper -   {{ sap_swpm_igs_helper_path }}/{{ sap_swpm_igs_helper_file_name }} "
-      - " IGS        -   {{ sap_swpm_igs_path }}/{{ sap_swpm_igs_file_name }} "
-      - " WEBDISP    -   {{ sap_swpm_web_dispatcher_path }}/{{ sap_swpm_web_dispatcher_file_name }} "
-      - " SAPCAR     -   {{ sap_swpm_sapcar_path }}/{{ sap_swpm_sapcar_file_name }} "
-      - " SWPM       -   {{ sap_swpm_swpm_path }}/{{ sap_swpm_swpm_sar_file_name }} "
-      - " MP Stack   -   {{ (sap_swpm_mp_stack_path | d('', true) + '/' + sap_swpm_mp_stack_file_name | d('', true)) | regex_replace('//*', '/') }}"
-      - " Backup     -   {{ sap_swpm_backup_location }} "
+    msg: |
+      SAPCAR:     {{ sap_swpm_sapcar_path }}: {{ __sap_swpm_fact_sapcar_file_name }}
+      SWPM:       {{ sap_swpm_swpm_path }}: {{ __sap_swpm_fact_swpm_sar_file_name }}
+      {% if not sap_swpm_generic %}
+      SAPEXEDB:   {{ sap_swpm_software_path }}: {{ __sap_swpm_register_sapexedb_files.files | map(attribute='path') | map('basename') | join(', ') | d('') }}
+      SAPEXE:     {{ sap_swpm_software_path }}: {{ __sap_swpm_register_sapexe_files.files | map(attribute='path') | map('basename') | join(', ') | d('') }}
+      IGS:        {{ sap_swpm_software_path }}: {{ __sap_swpm_register_igs_exe_files.files | map(attribute='path') | map('basename') | join(', ') | d('') }}
+      IGS Helper: {{ sap_swpm_software_path }}: {{ __sap_swpm_register_igs_helper_files.files | map(attribute='path') | map('basename') | join(', ') | d('') }}
+      {% if 'Webdispatcher' in sap_swpm_product_catalog_id | string %}
+      WEBDISP:    {{ sap_swpm_software_path }}: {{ __sap_swpm_register_sapwebdisp_files.files | map(attribute='path') | map('basename') | join(', ') | d('') }}
+      {% endif %}
+      {% endif %}
+      {% if sap_swpm_swpm_installation_type in ['maint_plan_stack', 'ha_maint_plan_stack'] %}
+      MP Stack:   {{ (sap_swpm_mp_stack_path | d('', true) + '/' + sap_swpm_mp_stack_file_name | d('', true)) | regex_replace('//*', '/') }}"
+      {% endif %}
+      {% if sap_swpm_backup_location is defined and sap_swpm_backup_location | string | trim | length > 0 %}
+      Backup:     {{ sap_swpm_backup_location }}
+      {% endif %}
+
 
 - name: SAP SWPM - Installation Process
   ansible.builtin.debug:

roles/sap_swpm/tasks/pre_install/prepare_software.yml

@@ -34,7 +34,7 @@
     - name: SAP SWPM Pre Install - Ensure correct permissions and ownership of all directories
       ansible.builtin.file:
         path: "{{ line_item }}"
-        recurse: no
+        recurse: false
         mode: "{{ sap_swpm_software_directory_mode }}"
         owner: "{{ sap_swpm_software_directory_owner }}"
         group: "{{ sap_swpm_software_directory_group }}"
@@ -76,219 +76,41 @@
         - __sap_swpm_register_find_result_files_non_sapcar is defined
 
 
-# SAPCAR Path
-
-- name: SAP SWPM Pre Install - Check availability of SAPCAR path - {{ sap_swpm_sapcar_path }}
-  ansible.builtin.stat:
-    path: "{{ sap_swpm_sapcar_path | d(sap_swpm_software_path) }}"
-  register: sap_swpm_sapcar_path_stat
-  failed_when: not sap_swpm_sapcar_path_stat.stat.exists
-
-- name: SAP SWPM Pre Install - Change ownership of SAPCAR path - {{ sap_swpm_sapcar_path }}
-  ansible.builtin.file:
-    path: "{{ sap_swpm_sapcar_path }}"
-    state: directory
-    recurse: no
-    mode: "{{ sap_swpm_software_directory_mode }}"
-    owner: "{{ sap_swpm_software_directory_owner }}"
-    group: "{{ sap_swpm_software_directory_group }}"
-  when: sap_swpm_set_file_permissions
-
-# SWPM Path
-
-- name: SAP SWPM Pre Install - Check availability of SWPM path - {{ sap_swpm_swpm_path }}
-  ansible.builtin.stat:
-    path: "{{ sap_swpm_swpm_path | d(sap_swpm_software_path) }}"
-  register: sap_swpm_swpm_path_stat
-  failed_when: not sap_swpm_swpm_path_stat.stat.exists
-
-- name: SAP SWPM Pre Install - Change ownership of SWPM path - {{ sap_swpm_swpm_path }}
-  ansible.builtin.file:
-    path: "{{ sap_swpm_swpm_path }}"
-    state: directory
-    recurse: no
-    mode: "{{ sap_swpm_software_directory_mode }}"
-    owner: "{{ sap_swpm_software_directory_owner }}"
-    group: "{{ sap_swpm_software_directory_group }}"
-  when:
-    - sap_swpm_swpm_path != sap_swpm_software_path
-    - sap_swpm_set_file_permissions
-
-
 ################
 # Get software files from software paths
 ################
 
-# 1. SAPCAR
+- name: SAP SWPM Pre Install - Prepare SAPCAR files
+  ansible.builtin.include_tasks:
+    file: software/sapcar.yml
 
-- name: SAP SWPM Pre Install - Get SAPCAR from {{ sap_swpm_sapcar_path }}
-  ansible.builtin.shell: |
-    ls SAPCAR*.EXE
-  args:
-    chdir: "{{ sap_swpm_sapcar_path }}"
-  register: sap_swpm_sapcar_file_name_get
-  changed_when: false
+- name: SAP SWPM Pre Install - Prepare SWPM files
+  ansible.builtin.include_tasks:
+    file: software/swpm.yml
 
-- name: SAP SWPM Pre Install - Set fact for SAPCAR
-  ansible.builtin.set_fact:
-    sap_swpm_sapcar_file_name: "{{ sap_swpm_sapcar_file_name_get.stdout }}"
-
-- name: SAP SWPM Pre Install - Check availability of SAPCAR - {{ sap_swpm_sapcar_path + '/' + sap_swpm_sapcar_file_name }}
-  ansible.builtin.stat:
-    path: "{{ sap_swpm_sapcar_path }}/{{ sap_swpm_sapcar_file_name }}"
-  register: sap_swpm_sapcar_file_name_stat
-  failed_when: not sap_swpm_sapcar_file_name_stat.stat.exists
-
-- name: SAP SWPM Pre Install - Ensure correct permissions and ownership of the SAPCAR*EXE file
-  ansible.builtin.file:
-    path: "{{ sap_swpm_sapcar_path }}/{{ sap_swpm_sapcar_file_name }}"
-    recurse: no
-    mode: "{{ sap_swpm_files_sapcar_mode }}"
-    owner: "{{ sap_swpm_files_sapcar_owner }}"
-    group: "{{ sap_swpm_files_sapcar_group }}"
-  when: sap_swpm_set_file_permissions
-
-# 2. SWPM
-
-- name: SAP SWPM Pre Install - Get SWPM from {{ sap_swpm_swpm_path }}
-  ansible.builtin.shell: |
-    ls SWPM*.SAR
-  args:
-    chdir: "{{ sap_swpm_swpm_path }}"
-  register: sap_swpm_swpm_sar_file_name_get
-  changed_when: false
-
-- name: SAP SWPM Pre Install - Set fact for SWPM
-  ansible.builtin.set_fact:
-    sap_swpm_swpm_sar_file_name: "{{ sap_swpm_swpm_sar_file_name_get.stdout }}"
-
-- name: SAP SWPM Pre Install - Check availability of SWPM - {{ sap_swpm_swpm_path + '/' + sap_swpm_swpm_sar_file_name }}
-  ansible.builtin.stat:
-    path: "{{ sap_swpm_swpm_path }}/{{ sap_swpm_swpm_sar_file_name }}"
-  register: sap_swpm_swpm_sar_file_name_stat
-  failed_when: not sap_swpm_swpm_sar_file_name_stat.stat.exists
-
-# Note: We use the permissions and ownership settings for non-SAPCAR*EXE files:
-- name: SAP SWPM Pre Install - Ensure correct permissions and ownership of the SWPM*SAR file
-  ansible.builtin.file:
-    path: "{{ sap_swpm_swpm_path }}/{{ sap_swpm_swpm_sar_file_name }}"
-    recurse: no
-    mode: "{{ sap_swpm_files_non_sapcar_mode }}"
-    owner: "{{ sap_swpm_files_non_sapcar_owner }}"
-    group: "{{ sap_swpm_files_non_sapcar_group }}"
-  when:
-    - sap_swpm_swpm_path != sap_swpm_software_path
-    - sap_swpm_set_file_permissions
 
 - name: SAP SWPM Pre Install - Full SAP System
   when: not sap_swpm_generic
   block:
 
-  # 3. IGS
+    - name: SAP SWPM Pre Install - Check IGS files
+      ansible.builtin.include_tasks:
+        file: software/igsexe.yml
 
-    - name: SAP SWPM Pre Install - Get IGS from software path
-      ansible.builtin.shell: |
-        ls igsexe*.sar
-      args:
-        chdir: "{{ sap_swpm_software_path }}"
-      register: sap_swpm_igs_file_name_get
-      changed_when: false
+    - name: SAP SWPM Pre Install - Check IGS Helper files
+      ansible.builtin.include_tasks:
+        file: software/igshelper.yml
 
-    - name: SAP SWPM Pre Install - Set fact for IGS
-      ansible.builtin.set_fact:
-        sap_swpm_igs_path: "{{ sap_swpm_software_path }}"
-        sap_swpm_igs_file_name: "{{ sap_swpm_igs_file_name_get.stdout }}"
+    - name: SAP SWPM Pre Install - Check SAPEXEDB files
+      ansible.builtin.include_tasks:
+        file: software/sapexedb.yml
 
-    - name: SAP SWPM Pre Install - Check availability of IGS - {{ sap_swpm_igs_path + '/' + sap_swpm_igs_file_name }}
-      ansible.builtin.stat:
-        path: "{{ sap_swpm_igs_path }}/{{ sap_swpm_igs_file_name }}"
-      register: sap_swpm_igs_file_name_stat
-      failed_when: not sap_swpm_igs_file_name_stat.stat.exists
+    - name: SAP SWPM Pre Install - Check SAPEXE files
+      ansible.builtin.include_tasks:
+        file: software/sapexe.yml
 
-  # 4. IGS Helper
 
-    - name: SAP SWPM Pre Install - Get IGS Helper from software path
-      ansible.builtin.shell: |
-        ls igshelper*.sar
-      args:
-        chdir: "{{ sap_swpm_software_path }}"
-      register: sap_swpm_igs_helper_file_name_get
-      changed_when: false
-
-    - name: SAP SWPM Pre Install - Set fact for IGS
-      ansible.builtin.set_fact:
-        sap_swpm_igs_helper_path: "{{ sap_swpm_software_path }}"
-        sap_swpm_igs_helper_file_name: "{{ sap_swpm_igs_helper_file_name_get.stdout }}"
-
-    - name: SAP SWPM Pre Install - Check availability of IGS Helper - {{ sap_swpm_igs_helper_path + '/' + sap_swpm_igs_helper_file_name }}
-      ansible.builtin.stat:
-        path: "{{ sap_swpm_igs_helper_path }}/{{ sap_swpm_igs_helper_file_name }}"
-      register: sap_swpm_igs_helper_file_name_stat
-      failed_when: not sap_swpm_igs_helper_file_name_stat.stat.exists
-
-  # 5. SAPEXEDB
-
-    - name: SAP SWPM Pre Install - Get SAPEXEDB from software path
-      ansible.builtin.shell: |
-        ls SAPEXEDB_*.SAR
-      args:
-        chdir: "{{ sap_swpm_software_path }}"
-      register: sap_swpm_kernel_dependent_file_name_get
-      changed_when: false
-
-    - name: SAP SWPM Pre Install - Set fact for SAPEXEDB
-      ansible.builtin.set_fact:
-        sap_swpm_kernel_dependent_path: "{{ sap_swpm_software_path }}"
-        sap_swpm_kernel_dependent_file_name: "{{ sap_swpm_kernel_dependent_file_name_get.stdout }}"
-
-    - name: SAP SWPM Pre Install - Check availability of SAPEXEDB - {{ sap_swpm_kernel_dependent_path + '/' + sap_swpm_kernel_dependent_file_name }}
-      ansible.builtin.stat:
-        path: "{{ sap_swpm_kernel_dependent_path }}/{{ sap_swpm_kernel_dependent_file_name }}"
-      register: sap_swpm_kernel_dependent_file_name_stat
-      failed_when: not sap_swpm_kernel_dependent_file_name_stat.stat.exists
-
-  # 6. SAPEXE
-
-    - name: SAP SWPM Pre Install - Get SAPEXE from software path
-      ansible.builtin.shell: |
-        ls SAPEXE_*.SAR
-      args:
-        chdir: "{{ sap_swpm_software_path }}"
-      register: sap_swpm_kernel_independent_file_name_get
-      changed_when: false
-
-    - name: SAP SWPM Pre Install - Set fact for SAPEXE
-      ansible.builtin.set_fact:
-        sap_swpm_kernel_independent_path: "{{ sap_swpm_software_path }}"
-        sap_swpm_kernel_independent_file_name: "{{ sap_swpm_kernel_independent_file_name_get.stdout }}"
-
-    - name: SAP SWPM Pre Install - Check availability of SAPEXE - {{ sap_swpm_kernel_independent_path + '/' + sap_swpm_kernel_independent_file_name }}
-      ansible.builtin.stat:
-        path: "{{ sap_swpm_kernel_independent_path }}/{{ sap_swpm_kernel_independent_file_name }}"
-      register: sap_swpm_kernel_independent_file_name_stat
-      failed_when: not sap_swpm_kernel_independent_file_name_stat.stat.exists
-
-- name: SAP SWPM Pre Install - Webdispatcher
+- name: SAP SWPM Pre Install - Check Webdispatcher files
+  ansible.builtin.include_tasks:
+    file: software/sapwebdisp.yml
   when: "'Webdispatcher' in sap_swpm_product_catalog_id | string"
-  block:
-
-  # 7. Web Dispatcher
-
-    - name: SAP SWPM Pre Install - Get WEBDISP from software path
-      ansible.builtin.shell: |
-        ls SAPWEBDISP_*.SAR
-      args:
-        chdir: "{{ sap_swpm_software_path }}"
-      register: sap_swpm_web_dispatcher_file_name_get
-      changed_when: false
-
-    - name: SAP SWPM Pre Install - Set fact for WEBDISP
-      ansible.builtin.set_fact:
-        sap_swpm_web_dispatcher_path: "{{ sap_swpm_software_path }}"
-        sap_swpm_web_dispatcher_file_name: "{{ sap_swpm_web_dispatcher_file_name_get.stdout }}"
-
-    - name: SAP SWPM Pre Install - Check availability of WEBDISP - {{ sap_swpm_web_dispatcher_path + '/' + sap_swpm_web_dispatcher_file_name }}
-      ansible.builtin.stat:
-        path: "{{ sap_swpm_web_dispatcher_path }}/{{ sap_swpm_web_dispatcher_file_name }}"
-      register: sap_swpm_web_dispatcher_file_name_stat
-      failed_when: not sap_swpm_web_dispatcher_file_name_stat.stat.exists

roles/sap_swpm/tasks/pre_install/software/igsexe.yml

@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+---
+
+# Auto-detection checks:
+# 1. Check if there is one or more files present.
+# NOTE: This is SAR file and it could be extracted to check for 'ansible_architecture',
+# but it is not mandatory and it will be handled by 'sapinst'.
+
+- name: SAP SWPM Pre Install - Find all IGS files in {{ sap_swpm_software_path }}
+  ansible.builtin.find:
+    paths: "{{ sap_swpm_software_path }}"
+    patterns: 'igsexe*.sar'
+  register: __sap_swpm_register_igs_exe_files
+
+- name: SAP SWPM Pre Install - Assert that IGS files were found
+  ansible.builtin.assert:
+    that:
+      - __sap_swpm_register_igs_exe_files.files | length > 0
+    success_msg: |
+      SUCCESS: IGS 'igsexe' files were found in '{{ sap_swpm_software_path }}'.
+      Files: {{ __sap_swpm_register_igs_exe_files.files | map(attribute='path') | map('basename') | join(', ') }}
+      They are not validated for compatibility with OS architecture '{{ ansible_architecture }}'.
+    fail_msg: |
+      FAIL: No IGS 'igsexe' files were found in '{{ sap_swpm_software_path }}'!