From cab069a529906dccf0e1721a362b2747ae0e58ad Mon Sep 17 00:00:00 2001
From: Marcel Mamula <marcel.mamula@suse.com>
Date: Wed, 14 Feb 2024 13:44:31 +0000
Subject: [PATCH] reverted main ordering, moved HAE detection

---
 tasks/enable-repositories/Suse.yml            | 24 +++++++++++++++++++
 tasks/main.yml                                |  6 ++---
 .../check-and-prepare-role-variables.yml      | 24 -------------------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/tasks/enable-repositories/Suse.yml b/tasks/enable-repositories/Suse.yml
index c07e39f8..2ae1bc89 100644
--- a/tasks/enable-repositories/Suse.yml
+++ b/tasks/enable-repositories/Suse.yml
@@ -1,3 +1,27 @@
 # SPDX-License-Identifier: MIT
 ---
 # All required repositories are already part of SLES for SAP 15 SP5+.
+
+# High Availability Extension is required for cluster setup as well
+# as qnetd/qdevice configuration.
+- name: Gather package facts
+  ansible.builtin.package_facts:
+    manager: auto
+
+- name: Check High Availability Extension presence using product file
+  ansible.builtin.stat:
+    path: /etc/products.d/sle-ha.prod
+  register: __ha_cluster_ha_ext_stat
+
+# Registering HA Extension creates file /etc/products.d/sle-ha.prod and
+# installs rpm sle-ha-release. Cluster software is not installed.
+- name: Assert that High Availability Extension is present
+  ansible.builtin.assert:
+    that:
+      - "'sle-ha-release' in ansible_facts.packages"
+      - __ha_cluster_ha_ext_stat.stat.exists
+    success_msg: "High Availability Extension was detected."
+    fail_msg: "High Availability Extension is not registered!
+      Register HA Extension before executing again."
+  # Fatal fail will occur if any of cluster nodes is missing HAE
+  any_errors_fatal: true
diff --git a/tasks/main.yml b/tasks/main.yml
index 31753026..3e20c8a3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,9 +8,6 @@
   when:
     - ha_cluster_enable_repos
 
-- name: Check and prepare role variables
-  include_tasks: shell_{{ ha_cluster_pacemaker_shell }}/check-and-prepare-role-variables.yml  # yamllint disable-line rule:line-length
-
 - name: Install role essential packages
   package:
     name: "{{
@@ -21,6 +18,9 @@
     use: "{{ (__ha_cluster_is_ostree | d(false)) |
              ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
 
+- name: Check and prepare role variables
+  include_tasks: shell_{{ ha_cluster_pacemaker_shell }}/check-and-prepare-role-variables.yml  # yamllint disable-line rule:line-length
+
 # The user is created by installing pacemaker packages. We just need to set the
 # password.
 - name: Set hacluster password
diff --git a/tasks/shell_crmsh/check-and-prepare-role-variables.yml b/tasks/shell_crmsh/check-and-prepare-role-variables.yml
index a2f68947..33f870fd 100644
--- a/tasks/shell_crmsh/check-and-prepare-role-variables.yml
+++ b/tasks/shell_crmsh/check-and-prepare-role-variables.yml
@@ -2,30 +2,6 @@
 ---
 - name: Check cluster configuration variables
   block:
-    # High Availability Extension is required for cluster setup as well
-    # as qnetd/qdevice configuration.
-    - name: Gather package facts
-      ansible.builtin.package_facts:
-        manager: auto
-
-    - name: Check High Availability Extension presence using product file
-      ansible.builtin.stat:
-        path: /etc/products.d/sle-ha.prod
-      register: __ha_cluster_ha_ext_stat
-
-    # Registering HA Extension creates file /etc/products.d/sle-ha.prod and
-    # installs rpm sle-ha-release. Cluster software is not installed.
-    - name: Assert that High Availability Extension is present
-      ansible.builtin.assert:
-        that:
-          - "'sle-ha-release' in ansible_facts.packages"
-          - __ha_cluster_ha_ext_stat.stat.exists
-        success_msg: "High Availability Extension was detected."
-        fail_msg: "High Availability Extension is not registered!
-          Register HA Extension before executing again."
-      # Fatal fail will occur if any of cluster nodes is missing HAE
-      any_errors_fatal: true
-
     - name: Fail if passwords are not specified
       ansible.builtin.fail:
         msg: "{{ item }} must be specified"