From 48e2ad4c1e081b9e6a336132a7f78cb7399c43d9 Mon Sep 17 00:00:00 2001
From: Ahmed AbdelHalim <pm@a14m.me>
Date: Wed, 10 Sep 2025 17:52:58 +0200
Subject: Refactor role dependencies to be more module modular

This modularity means that each role can be installed in a playbook by
itself as long as the other roles exist around it.
This also straps the ensure dependency packages exist in any of the
roles tasks, they should be moved to their own roles and configured
properly if needed.
---
 roles/network/handlers/main.yml | 6 +++---
 roles/network/meta/main.yml     | 3 ++-
 roles/network/tasks/main.yml    | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'roles/network')

diff --git a/roles/network/handlers/main.yml b/roles/network/handlers/main.yml
index 8bd5cdec..c0cc4927 100644
--- a/roles/network/handlers/main.yml
+++ b/roles/network/handlers/main.yml
@@ -1,13 +1,13 @@
 ---
 - name: "Reload systemd"
   become: true
-  ansible.builtin.systemd_service:
+  ansible.builtin.systemd:
     daemon_reload: true
   when: not ansible_is_chroot
 
 - name: "Restart NetworkManager"
   become: true
-  ansible.builtin.systemd_service:
+  ansible.builtin.systemd:
     name: "NetworkManager"
     enabled: true
     state: "restarted"
@@ -15,7 +15,7 @@
 
 - name: "Restart systemd-resolved"
   become: true
-  ansible.builtin.systemd_service:
+  ansible.builtin.systemd:
     name: "systemd-resolved"
     enabled: true
     state: "restarted"
diff --git a/roles/network/meta/main.yml b/roles/network/meta/main.yml
index e0eb034f..fa562130 100644
--- a/roles/network/meta/main.yml
+++ b/roles/network/meta/main.yml
@@ -1,5 +1,6 @@
 ---
-dependencies: []
+dependencies:
+  - role: "systemd"
 galaxy_info:
   author: "a14m"
   description: "Configure basic distro networking features"
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 3803c496..fbcc03c6 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -23,7 +23,7 @@
 
 - name: "Ensure network enabled services are enabled"
   become: true
-  ansible.builtin.systemd_service:
+  ansible.builtin.systemd:
     name: "{{ item }}"
     enabled: true
     state: "started"
@@ -40,7 +40,7 @@
 
 - name: "Ensure network disabled services are disabled"
   become: true
-  ansible.builtin.systemd_service:
+  ansible.builtin.systemd:
     name: "{{ item }}"
     enabled: false
     state: "stopped"
-- 
cgit v1.2.3