Fixing ignored sap_sid parameter

Signed-off-by: Nicolas Bettembourg <[email protected]>

Author: nbttmbrg

roles/sap_control/tasks/main.yml

@@ -53,29 +53,37 @@
 #   - stop_sap_hana
 #   - start_sap_hana
 
-- name: Set function list facts
-  ansible.builtin.set_fact:
-    sap_control_act_type: "{{ sap_control_function.split('_')[0] | lower }}"
-    sap_control_get_type: "{{ sap_control_function.split('_')[1] | lower }}"
-    sap_control_sap_type: "{{ sap_control_function.split('_')[2] | lower }}"
-
-- name: Set sap_facts_param
-  ansible.builtin.set_fact:
-    sap_facts_param: "{{ sap_control_get_type }}"
+# These facts were only used for the sap_system_facts module, but it doesn't accept sap_facts_param anymore.
+# - name: Set function list facts
+#   ansible.builtin.set_fact:
+#     sap_control_act_type: "{{ sap_control_function.split('_')[0] | lower }}"
+#     sap_control_get_type: "{{ sap_control_function.split('_')[1] | lower }}"
+#     sap_control_sap_type: "{{ sap_control_function.split('_')[2] | lower }}"
+
+# - name: Set sap_facts_param
+#   ansible.builtin.set_fact:
+#     sap_facts_param: "{{ sap_control_get_type }}"
+
+# - name: Set sap_facts_param
+#   ansible.builtin.set_fact:
+#     sap_facts_param: "{{ sap_control_sap_type }}"
+#   when:
+#     - "'all' in sap_control_function"
+#     - "'sap' not in sap_control_sap_type"
 
-- name: Set sap_facts_param
-  ansible.builtin.set_fact:
-    sap_facts_param: "{{ sap_control_sap_type }}"
-  when:
-    - "'all' in sap_control_function"
-    - "'sap' not in sap_control_sap_type"
+# # When not all
+# - name: Set sap_facts_param
+#   ansible.builtin.set_fact:
+#     sap_facts_param: "{{ sap_sid }}"
+#   when:
+#     - "'all' not in sap_control_function"
 
-# When not all
-- name: Set sap_facts_param
-  ansible.builtin.set_fact:
-    sap_facts_param: "{{ sap_sid }}"
-  when:
-    - "'all' not in sap_control_function"
+# # Get SAP Info
+# - name: Get SAP Info
+#   vars:
+#     sap_info_get_function: "get_{{ sap_control_get_type }}_{{ sap_control_sap_type }}"
+#   ansible.builtin.include_role:
+#     name: roles/sap_info
 
 # # Get SAP Info
 # - name: Get SAP Info

roles/sap_control/tasks/prepare.yml

@@ -9,13 +9,29 @@
   ansible.builtin.set_fact:
     sap_control_name_header: "{{ sap_type | upper }} {{ funct_type | capitalize }}"
 
+- name: Prepare - Set SAP System List
+  ansible.builtin.set_fact:
+    sap_system_list: "{{ ('all' in sap_control_function)
+      | ansible.builtin.ternary(sap_facts_register.ansible_facts.sap, sap_facts_register.ansible_facts.sap | selectattr('SID', 'eq', sap_sid | upper))
+      | list }}"
+
+- name: Debug found SID
+  ansible.builtin.debug:
+    msg: "Found SAP systems for SID: {{ sap_sid }} - {{ sap_system_list }} system(s) found"
+    verbosity: 1
+
+- name: Fail if no SAP systems found
+  ansible.builtin.fail:
+    msg: "No SAP systems found for SID: {{ sap_sid }}"
+  when: sap_system_list | length == 0
+
 - name: SAP Control
   vars:
     sap_control_execute_sid: "{{ item.SID }}"
     sap_control_execute_type: "{{ item.Type }}"
     sap_control_execute_instance_nr: "{{ item.NR }}"
     sap_control_execute_instance_type: "{{ item.InstanceType }}"
   ansible.builtin.include_tasks: "sapcontrol.yml"
-  loop: "{{ sap_facts_register.ansible_facts.sap }}"
+  loop: "{{ sap_system_list }}"
   when:
     - "item.InstanceType | lower == sap_type | lower"