From d1d188cd2cc671ecb6c9b7a94d744d63f85648d7 Mon Sep 17 00:00:00 2001 From: Ahmed AbdelHalim Date: Mon, 11 Aug 2025 00:32:04 +0200 Subject: Refactor playbook to simplify package installs for different OSs --- roles/network/tasks/install-debian.yml | 1 - roles/network/tasks/main.yml | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'roles/network') diff --git a/roles/network/tasks/install-debian.yml b/roles/network/tasks/install-debian.yml index 8368d7e3..a5367762 100644 --- a/roles/network/tasks/install-debian.yml +++ b/roles/network/tasks/install-debian.yml @@ -23,7 +23,6 @@ when: not ansible_is_chroot failed_when: false # Not required for boot - tags: [] - name: "(chroot): Disable conflicting services" ansible.builtin.command: diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 54b0a9ed..2bebaf22 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -1,4 +1,10 @@ --- +- name: "Include OS-specific variables" + ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + +- name: "Include OS-specific tasks" + ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" + - name: "Configure /etc/hostname" become: true ansible.builtin.copy: @@ -22,12 +28,6 @@ when: hostname is defined # Not required for boot -- name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" - -- name: "Install OS-specific packages" - ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" - - name: "(chroot): Ensure network_services are enabled" ansible.builtin.command: cmd: "systemctl enable {{ item }}" -- cgit v1.2.3