Merge pull request #1035 from berndfinger/issue-1030-convert-catalog-id-to-string

sap_swpm: Fix issue #1030

Author: berndfinger

roles/sap_swpm/defaults/main.yml

@@ -252,7 +252,7 @@ sap_swpm_virtual_hostname:
 
 # Two methods exist for SAP NWAS JAVA, jload and extramile (BatchDeployer) before call to Deploy Controller Runner
 # Default to extramile for SAP NWAS JAVA, except SAP S/4HANA
-sap_swpm_java_import_method: "{{ 'jload' if 'S4H' in sap_swpm_product_catalog_id else 'extramile' }}"
+sap_swpm_java_import_method: "{{ 'jload' if 'S4H' in sap_swpm_product_catalog_id | string else 'extramile' }}"
 
 # Use empty list which will create inifile parameter as blank for default installation
 sap_swpm_java_template_id_selected_list: []

roles/sap_swpm/tasks/post_install.yml

@@ -67,4 +67,5 @@
   when:
     - sap_swpm_sum_start
     - not sap_swpm_swpm_observer_mode
-    - "'NW_ABAP_CI:' in sap_swpm_product_catalog_id or 'NW_ABAP_OneHost:' in sap_swpm_product_catalog_id"
+    - "'NW_ABAP_CI:' in sap_swpm_product_catalog_id | string or
+       'NW_ABAP_OneHost:' in sap_swpm_product_catalog_id | string"

roles/sap_swpm/tasks/pre_install/generate_inifile.yml

@@ -98,13 +98,13 @@
       ansible.builtin.set_fact:
         sap_swpm_db_schema: "{{ sap_swpm_db_schema_abap }}"
         sap_swpm_db_schema_password: "{{ sap_swpm_db_schema_abap_password }}"
-      when: "'ABAP' in sap_swpm_product_catalog_id"
+      when: "'ABAP' in sap_swpm_product_catalog_id | string"
 
     - name: SAP SWPM Pre Install - Set password facts when Java
       ansible.builtin.set_fact:
         sap_swpm_db_schema: "{{ sap_swpm_db_schema_java }}"
         sap_swpm_db_schema_password: "{{ sap_swpm_db_schema_java_password }}"
-      when: "'Java' in sap_swpm_product_catalog_id"
+      when: "'Java' in sap_swpm_product_catalog_id | string"
 
 # If the individual passwords are set to a non empty string, use those:
     - name: SAP SWPM Pre Install - Set other user passwords using master password

roles/sap_swpm/tasks/pre_install/install_type.yml

@@ -17,27 +17,19 @@
 # - Advanced Adapter Engine Extended (AEX) with .AEX .AEXHA
 # - Process Integration / Process Orchestration (PI/PO) with .PI .PIHA .PIABAP .PIABAPHA .PIJAVA .PIJAVAHA
 
-#- name: SAP SWPM Pre Install - Check if general SAP Software installation
-#  ansible.builtin.set_fact:
-#    sap_swpm_swpm_installation_type: "general"
-#    sap_swpm_swpm_installation_header: "General installation of SAP Software"
-#  when:
-#    - "not '.ABAPHA' in sap_swpm_product_catalog_id"
-#    - "not '.CP' in sap_swpm_product_catalog_id"
-
 - name: SAP SWPM Pre Install - Check if System Copy (Backup/Restore)
   ansible.builtin.set_fact:
     sap_swpm_swpm_installation_type: "restore"
     sap_swpm_swpm_installation_header: "System Copy restore from backup"
-  when:
-    - "'.CP' in sap_swpm_product_catalog_id"
+  when: "'.CP' in sap_swpm_product_catalog_id | string"
 
 - name: SAP SWPM Pre Install - Check if SAP High Availability installation
   ansible.builtin.set_fact:
     sap_swpm_swpm_installation_type: "ha"
     sap_swpm_swpm_installation_header: "High Availability Installation using virtual hostname"
-  when:
-    - "'.ABAPHA' in sap_swpm_product_catalog_id or '.HA' in sap_swpm_product_catalog_id or '.HACP' in sap_swpm_product_catalog_id"
+  when: "'.ABAPHA' in sap_swpm_product_catalog_id | string or
+         '.HA' in sap_swpm_product_catalog_id | string or
+         '.HACP' in sap_swpm_product_catalog_id | string"
 
 - name: SAP SWPM Pre Install - Check if installation using SAP Maintenance Planner
   ansible.builtin.set_fact:
@@ -51,7 +43,7 @@
     sap_swpm_swpm_installation_type: "ha_maint_plan_stack"
     sap_swpm_swpm_installation_header: "High Availability Installation using virtual hostname and SAP Maintenance Planner Stack XML"
   when:
-    - "'.ABAPHA' in sap_swpm_product_catalog_id"
+    - "'.ABAPHA' in sap_swpm_product_catalog_id | string"
     - sap_swpm_mp_stack_path is defined and not sap_swpm_mp_stack_path is none
 
 ################

roles/sap_swpm/tasks/pre_install/install_type/ha_install.yml

@@ -15,4 +15,4 @@
 # - name: SAP SWPM Pre Install - HA Installation - Create User when ASCS (initial HA setup)
 #   ansible.builtin.include_tasks: ../create_os_user.yml
 #   when:
-#     - "'_ASCS' in sap_swpm_product_catalog_id"
+#     - "'_ASCS' in sap_swpm_product_catalog_id | string"

roles/sap_swpm/tasks/pre_install/install_type/ha_maint_plan_stack_install.yml

@@ -15,7 +15,7 @@
 # - name: SAP SWPM Pre Install - HA Installation - Create User when ASCS (initial HA setup)
 #   ansible.builtin.include_tasks: ../create_os_user.yml
 #   when:
-#     - "'_ASCS' in sap_swpm_product_catalog_id"
+#     - "'_ASCS' in sap_swpm_product_catalog_id | string"
 
 
 # Install using SAP Maintenance Planner Stack XML

roles/sap_swpm/tasks/pre_install/install_type/restore_install.yml

@@ -7,7 +7,9 @@
   ansible.builtin.stat:
     path: "{{ sap_swpm_backup_location }}"
   register: sap_swpm_backup_location_stat
-  failed_when: not sap_swpm_backup_location_stat.stat.exists and '.CP' in sap_swpm_product_catalog_id
+  failed_when:
+    - not sap_swpm_backup_location_stat.stat.exists
+    - "'.CP' in sap_swpm_product_catalog_id | string"
 
 - name: SAP SWPM Pre Install - Change ownership of backup location - {{ sap_swpm_backup_location }}
   ansible.builtin.file:
@@ -18,4 +20,5 @@
     owner: root
     group: root
   when:
-    - sap_swpm_backup_location_stat.stat.exists and sap_swpm_backup_location_stat.stat.isdir
+    - sap_swpm_backup_location_stat.stat.exists
+    - sap_swpm_backup_location_stat.stat.isdir

roles/sap_swpm/tasks/pre_install/prepare_software.yml

@@ -265,7 +265,7 @@
       failed_when: not sap_swpm_kernel_independent_file_name_stat.stat.exists
 
 - name: SAP SWPM Pre Install - Webdispatcher
-  when: "'Webdispatcher' in sap_swpm_product_catalog_id"
+  when: "'Webdispatcher' in sap_swpm_product_catalog_id | string"
   block:
 
   # 7. Web Dispatcher