diff options
| author | Ahmed Abdelhalim <[email protected]> | 2025-09-15 16:57:57 +0200 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2025-09-15 16:57:57 +0200 |
| commit | 4d7ca7973fb04abd73e800531c126a4c47b50379 (patch) | |
| tree | 2f02e10f2b203a1de3774a6843b85cfa8145cb9b | |
| parent | 9ff64af2d51260d65de083ddb9fdb8a99383b238 (diff) | |
Update network role to remove dhcpcd dependency
Fix install on ubuntu not having networking service stated by default on
ubuntu
| -rw-r--r-- | host_vars/ubuntu.local.yml | bin | 203 -> 345 bytes | |||
| -rw-r--r-- | roles/network/tasks/install-debian.yml | 1 | ||||
| -rw-r--r-- | roles/network/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/network/templates/NetworkManager.conf.j2 | 2 | ||||
| -rw-r--r-- | roles/network/vars/archlinux.yml | 2 | ||||
| -rw-r--r-- | roles/network/vars/debian.yml | 2 | ||||
| -rw-r--r-- | roles/network/vars/ubuntu.yml | 12 |
7 files changed, 15 insertions, 6 deletions
diff --git a/host_vars/ubuntu.local.yml b/host_vars/ubuntu.local.yml Binary files differindex 4b3a00d2..ec917612 100644 --- a/host_vars/ubuntu.local.yml +++ b/host_vars/ubuntu.local.yml diff --git a/roles/network/tasks/install-debian.yml b/roles/network/tasks/install-debian.yml index 6f94ff5c..78b65a7d 100644 --- a/roles/network/tasks/install-debian.yml +++ b/roles/network/tasks/install-debian.yml @@ -11,6 +11,7 @@ pkg: - "avahi-daemon" - "avahi-utils" + - "dhcpcd" state: "absent" autoremove: true purge: true diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 3803c496..876abc02 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "Include OS-specific variables" - ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" + ansible.builtin.include_vars: "{{ ansible_distribution | lower }}.yml" - name: "Include OS-specific tasks" ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml" diff --git a/roles/network/templates/NetworkManager.conf.j2 b/roles/network/templates/NetworkManager.conf.j2 index 49dcd9bf..8d84b761 100644 --- a/roles/network/templates/NetworkManager.conf.j2 +++ b/roles/network/templates/NetworkManager.conf.j2 @@ -2,7 +2,7 @@ uri=https://ping.archlinux.org [main] -dhcp=dhcpcd +dhcp=internal plugins=ifupdown,keyfile dns=systemd-resolved diff --git a/roles/network/vars/archlinux.yml b/roles/network/vars/archlinux.yml index 142e7bf2..44d54048 100644 --- a/roles/network/vars/archlinux.yml +++ b/roles/network/vars/archlinux.yml @@ -1,6 +1,5 @@ --- network_packages: - - "dhcpcd" - "networkmanager" - "bind" # provides dig and nslookup @@ -9,6 +8,5 @@ network_enabled_services: - "NetworkManager" network_disabled_services: - - "dhcpcd" - "systemd-networkd" - "systemd-networkd.socket" diff --git a/roles/network/vars/debian.yml b/roles/network/vars/debian.yml index 3089a19e..7b29adda 100644 --- a/roles/network/vars/debian.yml +++ b/roles/network/vars/debian.yml @@ -1,6 +1,5 @@ --- network_packages: - - "dhcpcd" - "systemd-resolved" - "network-manager" - "dnsutils" # provides dig and nslookup @@ -10,6 +9,5 @@ network_enabled_services: - "NetworkManager" network_disabled_services: - - "dhcpcd" - "networking" - "systemd-networkd" diff --git a/roles/network/vars/ubuntu.yml b/roles/network/vars/ubuntu.yml new file mode 100644 index 00000000..f3d9ece1 --- /dev/null +++ b/roles/network/vars/ubuntu.yml @@ -0,0 +1,12 @@ +--- +network_packages: + - "systemd-resolved" + - "network-manager" + - "dnsutils" # provides dig and nslookup + +network_enabled_services: + - "systemd-resolved" + - "NetworkManager" + +network_disabled_services: + - "systemd-networkd" |