From a897ea51f83a7d98f721f0c0dfc436e1c2774c27 Mon Sep 17 00:00:00 2001
From: reminec <2b0cfddf-5ce0-4693-a420-a6df4afdb1fe@users.tedomum.net>
Date: Sat, 2 Dec 2023 11:27:43 +0100
Subject: [PATCH] move group_vars into defaults vars role
---
ansible/group_vars/localhost.yaml | 1 -
ansible/group_vars/nodes.yaml | 19 -------------------
ansible/roles/hepto/defaults/main.yaml | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 20 deletions(-)
delete mode 100644 ansible/group_vars/localhost.yaml
delete mode 100644 ansible/group_vars/nodes.yaml
diff --git a/ansible/group_vars/localhost.yaml b/ansible/group_vars/localhost.yaml
deleted file mode 100644
index 8b13789..0000000
--- a/ansible/group_vars/localhost.yaml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ansible/group_vars/nodes.yaml b/ansible/group_vars/nodes.yaml
deleted file mode 100644
index 529ff50..0000000
--- a/ansible/group_vars/nodes.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# General config
-bin_dir: /usr/local/bin
-systemd_dir: /etc/systemd/system
-storage_dir: /var/lib
-
-# Hepto deployment
-hepto_version: 79361
-hepto_url: "https://forge.tedomum.net/acides/hepto/-/jobs/{{ hepto_version }}/artifacts/raw/hepto"
-
-# Cluster and node settings
-cluster_name: hepto
-node_name: "{{ inventory_hostname }}"
-node_iface: eth0
-kubeconfig: "{{ storage_dir }}/{{ cluster_name }}/{{ node_name }}/kubeconfig"
-
-# Dynamic variables based on groups
-node_role: "{{ 'master' if 'master' in group_names else 'node' }}"
-cluster_anchor: "{{ groups['anchor'] | map('extract', hostvars, 'node_ip') | list | ansible.utils.ipaddr('address') | first }}"
-external_ips: "{{ groups['public'] | map('extract', hostvars, 'node_ip') | list | ansible.utils.ipaddr('address') }}"
diff --git a/ansible/roles/hepto/defaults/main.yaml b/ansible/roles/hepto/defaults/main.yaml
index 2a1247c..6dc7586 100644
--- a/ansible/roles/hepto/defaults/main.yaml
+++ b/ansible/roles/hepto/defaults/main.yaml
@@ -1,2 +1,22 @@
+# General config
+bin_dir: /usr/local/bin
+systemd_dir: /etc/systemd/system
+storage_dir: /var/lib
+
hepto_bin: "{{ bin_dir }}/hepto.{{ hepto_version }}"
config_file: "/etc/{{ cluster_name }}/{{ node_name }}"
+
+# Hepto deployment
+hepto_version: 79361
+hepto_url: "https://forge.tedomum.net/acides/hepto/-/jobs/{{ hepto_version }}/artifacts/raw/hepto"
+
+# Cluster and node settings
+cluster_name: hepto
+node_name: "{{ inventory_hostname }}"
+node_iface: eth0
+kubeconfig: "{{ storage_dir }}/{{ cluster_name }}/{{ node_name }}/kubeconfig"
+
+# Dynamic variables based on groups
+node_role: "{{ 'master' if 'master' in group_names else 'node' }}"
+cluster_anchor: "{{ groups['anchor'] | map('extract', hostvars, 'node_ip') | list | ansible.utils.ipaddr('address') | first }}"
+external_ips: "{{ groups['public'] | map('extract', hostvars, 'node_ip') | list | ansible.utils.ipaddr('address') }}"
--
GitLab