sap_swpm: Improve the fail message for virt hostname resolution

Signed-off-by: Bernd Finger <[email protected]>

roles/sap_ha_pacemaker_cluster/vars/redhat.yml

@@ -84,7 +84,8 @@ __sap_ha_pacemaker_cluster_fence_agent_packages_dict:
 # Dictionary with extra platform specific packages
 __sap_ha_pacemaker_cluster_platform_extra_packages_dict:
   cloud_aws_ec2_vs:
-    - awscli
+    - "{{ 'resource-agents-cloud' if ansible_distribution_major_version is version('9', '>=') else 'awscli' }}"
+    - "{{ 'awscli2' if ansible_distribution_version is version('9.5', '>=') else '' }}"
   cloud_gcp_ce_vm:
     - resource-agents-gcp
   cloud_msazure_vm:

roles/sap_install_media_detect/tasks/prepare/create_file_list_phase_2.yml

@@ -27,7 +27,7 @@
 
 - name: SAP Install Media Detect - Prepare - Iterate over files and determine file type, including command for handling RAR files
   ansible.builtin.command: "{{ __sap_install_media_detect_sapfile_path }} -e --lsar_file={{ __sap_install_media_detect_rar_list.split(' ')[0] }} --sapcar_file={{ __sap_install_media_detect_fact_sapcar_path }} {{ line_item }}"
-  register: __sap_install_media_detect_register_files_phase_2
+  register: __sap_install_media_detect_register_files_phase_2_rar
   loop: "{{ __sap_install_media_detect_fact_find_result_phase_2 }}"
   loop_control:
     loop_var: line_item
@@ -36,13 +36,19 @@
 
 - name: SAP Install Media Detect - Prepare - Iterate over files and determine file type, without command for handling RAR files
   ansible.builtin.command: "{{ __sap_install_media_detect_sapfile_path }} -e --sapcar_file={{ __sap_install_media_detect_fact_sapcar_path }} {{ line_item }}"
-  register: __sap_install_media_detect_register_files_phase_2
+  register: __sap_install_media_detect_register_files_phase_2_norar
   loop: "{{ __sap_install_media_detect_fact_find_result_phase_2 }}"
   loop_control:
     loop_var: line_item
   changed_when: false
   when: not sap_install_media_detect_rar_handling
 
+- name: SAP Install Media Detect - Prepare - Set fact from determining the file type
+  ansible.builtin.set_fact:
+    __sap_install_media_detect_register_files_phase_2: "{{ __sap_install_media_detect_register_files_phase_2_rar
+      if sap_install_media_detect_rar_handling
+      else __sap_install_media_detect_register_files_phase_2_norar }}"
+
 - name: SAP Install Media Detect - Prepare - Set fact with the results of the sapfile command
   ansible.builtin.set_fact:
     __sap_install_media_detect_fact_files_sapfile_results: "{{ __sap_install_media_detect_fact_files_sapfile_results + [__new_dict] }}"

roles/sap_swpm/tasks/pre_install/assert_hostname_resolution_for_ha.yml

@@ -39,7 +39,7 @@
 - name: SAP SWPM Pre Install - HA settings - Assert that sap_swpm_virtual_hostname can be resolved
   ansible.builtin.assert:
     that: __sap_swpm_fact_virtual_ip is defined and __sap_swpm_fact_virtual_ip | length > 0
-    fail_msg: "FAIL: 'sap_swpm_virtual_hostname' is not defined or cannot be resolved correctly!"
+    fail_msg: "FAIL: 'sap_swpm_virtual_hostname' is not defined, cannot be resolved, or has multiple entries in /etc/hosts!"
     success_msg: "PASS: {{ sap_swpm_virtual_hostname }} can be resolved."
 
 - name: SAP SWPM Pre Install - HA settings - Assert that sap_swpm_fact_virtual_ip is part of ansible_all_ipv4_addresses