From 471b4fbea46f61269183815258c187eb49f763bc Mon Sep 17 00:00:00 2001
From: laszlojau <49835454+laszlojau@users.noreply.github.com>
Date: Sat, 8 Jun 2024 15:00:55 +0930
Subject: [PATCH] Add group variables to the prereq role

Signed-off-by: laszlojau <49835454+laszlojau@users.noreply.github.com>
---
 roles/prereq/defaults/main.yml | 2 ++
 roles/prereq/tasks/main.yml    | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/roles/prereq/defaults/main.yml b/roles/prereq/defaults/main.yml
index 75407909b..61618e2f7 100644
--- a/roles/prereq/defaults/main.yml
+++ b/roles/prereq/defaults/main.yml
@@ -1,2 +1,4 @@
 ---
 api_port: 6443  # noqa var-naming[no-role-prefix]
+server_group: server  # noqa var-naming[no-role-prefix]
+agent_group: agent  # noqa var-naming[no-role-prefix]
diff --git a/roles/prereq/tasks/main.yml b/roles/prereq/tasks/main.yml
index 8ec6c00c5..2606dbbe5 100644
--- a/roles/prereq/tasks/main.yml
+++ b/roles/prereq/tasks/main.yml
@@ -51,7 +51,7 @@
     - name: If ufw enabled, open etcd ports
       when:
         - ufw_status['stdout'] == "Status':' active"
-        - groups['server'] | length > 1
+        - groups[server_group] | length > 1
       community.general.ufw:
         rule: allow
         port: "2379:2381"
@@ -79,7 +79,7 @@
         immediate: true
 
     - name: If firewalld enabled, open etcd ports
-      when: groups['server'] | length > 1
+      when: groups[server_group] | length > 1
       ansible.posix.firewalld:
         port: "2379-2381/tcp"
         zone: internal
@@ -111,8 +111,8 @@
       loop: >-
         {{
           (
-            groups['server'] | default([])
-            + groups['agent'] | default([])
+            groups[server_group] | default([])
+            + groups[agent_group] | default([])
           )
           | map('extract', hostvars, ['ansible_default_ipv4', 'address'])
           | flatten | unique | list