From b5ff9670654b3544964b97cd3ed84b4d0893fa88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavi=20Lle=C3=B3=20Tom=C3=A1s?= <xavi@verdnatura.es>
Date: Tue, 4 Mar 2025 10:55:16 +0100
Subject: [PATCH] refs #8553 - move role to root path

---
 playbooks/dhcp.yml                              | 6 ++++++
 roles/dhcp/handlers/main.yml                    | 4 ++++
 roles/{services => dhcp}/tasks/dhcp.yml         | 0
 roles/dhcp/tasks/main.yml                       | 3 +++
 roles/{services => dhcp}/templates/dhcpd.conf   | 0
 roles/{services => dhcp}/templates/partner.conf | 0
 roles/{services => dhcp}/templates/rndc.key     | 0
 roles/services/handlers/main.yml                | 4 ----
 roles/services/tasks/main.yml                   | 3 +--
 9 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 playbooks/dhcp.yml
 create mode 100644 roles/dhcp/handlers/main.yml
 rename roles/{services => dhcp}/tasks/dhcp.yml (100%)
 create mode 100644 roles/dhcp/tasks/main.yml
 rename roles/{services => dhcp}/templates/dhcpd.conf (100%)
 rename roles/{services => dhcp}/templates/partner.conf (100%)
 rename roles/{services => dhcp}/templates/rndc.key (100%)

diff --git a/playbooks/dhcp.yml b/playbooks/dhcp.yml
new file mode 100644
index 0000000..9a89db8
--- /dev/null
+++ b/playbooks/dhcp.yml
@@ -0,0 +1,6 @@
+- name: Configure DHCP
+  hosts: all
+  tasks:
+  - name: Configure services to install in the server
+    import_role:
+      name: dhcp
\ No newline at end of file
diff --git a/roles/dhcp/handlers/main.yml b/roles/dhcp/handlers/main.yml
new file mode 100644
index 0000000..88fd9c8
--- /dev/null
+++ b/roles/dhcp/handlers/main.yml
@@ -0,0 +1,4 @@
+- name: restart-dhcp
+  systemd:
+    name: isc-dhcp-server
+    state: restarted
diff --git a/roles/services/tasks/dhcp.yml b/roles/dhcp/tasks/dhcp.yml
similarity index 100%
rename from roles/services/tasks/dhcp.yml
rename to roles/dhcp/tasks/dhcp.yml
diff --git a/roles/dhcp/tasks/main.yml b/roles/dhcp/tasks/main.yml
new file mode 100644
index 0000000..34b7778
--- /dev/null
+++ b/roles/dhcp/tasks/main.yml
@@ -0,0 +1,3 @@
+- import_tasks: dhcp.yml
+  tags: dhcp
+
diff --git a/roles/services/templates/dhcpd.conf b/roles/dhcp/templates/dhcpd.conf
similarity index 100%
rename from roles/services/templates/dhcpd.conf
rename to roles/dhcp/templates/dhcpd.conf
diff --git a/roles/services/templates/partner.conf b/roles/dhcp/templates/partner.conf
similarity index 100%
rename from roles/services/templates/partner.conf
rename to roles/dhcp/templates/partner.conf
diff --git a/roles/services/templates/rndc.key b/roles/dhcp/templates/rndc.key
similarity index 100%
rename from roles/services/templates/rndc.key
rename to roles/dhcp/templates/rndc.key
diff --git a/roles/services/handlers/main.yml b/roles/services/handlers/main.yml
index fa05b49..2727cca 100644
--- a/roles/services/handlers/main.yml
+++ b/roles/services/handlers/main.yml
@@ -5,7 +5,3 @@
 - name: reload-systemd
   command:
     cmd: systemctl daemon-reload
-- name: restart-dhcp
-  systemd:
-    name: isc-dhcp-server
-    state: restarted
diff --git a/roles/services/tasks/main.yml b/roles/services/tasks/main.yml
index f39cc77..4f5bbea 100644
--- a/roles/services/tasks/main.yml
+++ b/roles/services/tasks/main.yml
@@ -2,5 +2,4 @@
   tags: timeserver
 - import_tasks: adsamba.yml
   tags: adsamba
-- import_tasks: dhcp.yml
-  tags: dhcp
+