From 4dafbd8b8500f2871ff687f606f7b4eba4e105ef Mon Sep 17 00:00:00 2001 From: Finn Hercke Date: Mon, 24 Mar 2025 08:56:01 +0100 Subject: [PATCH] Move migration from IWD to WPA-supplicant to role To ensure that migration only runs when EAP-TLS certificate is installed correctly --- lmn-client.yml | 25 ------------------- .../tasks/eap-tls_issue-certificate.yaml | 16 ++++++++++++ 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/lmn-client.yml b/lmn-client.yml index a3d44fd..17d7844 100644 --- a/lmn-client.yml +++ b/lmn-client.yml @@ -382,31 +382,6 @@ - /etc/systemd/network/wlan-dhcp.network - /etc/NetworkManager/system-connections/FVS-devices.nmconnection - - name: Enable wpa-supplicant - ansible.builtin.systemd: - name: wpa_supplicant.service - enabled: true - tags: - - never - - wlan_8021x - - - name: Disable iwd - ansible.builtin.systemd: - name: iwd.service - enabled: false - tags: - - never - - wlan_8021x - - - name: Remove deprecated NetworkManager config - ansible.builtin.blockinfile: - path: /etc/NetworkManager/NetworkManager.conf - state: absent - tags: - - never - - wlan_8021x - - - name: Apply roles that must run serial hosts: all remote_user: ansible diff --git a/roles/lmn_wlan/tasks/eap-tls_issue-certificate.yaml b/roles/lmn_wlan/tasks/eap-tls_issue-certificate.yaml index 2e63183..a3258df 100644 --- a/roles/lmn_wlan/tasks/eap-tls_issue-certificate.yaml +++ b/roles/lmn_wlan/tasks/eap-tls_issue-certificate.yaml @@ -94,3 +94,19 @@ 802-1x.private-key /etc/ssl/private/{{ wlan_ssid }}.key 802-1x.private-key-password dummy changed_when: false + +# Temporary fix used to migrate from IWD to WPA-Supplicant - Will be removed later +- name: Enable wpa-supplicant + ansible.builtin.systemd: + name: wpa_supplicant.service + enabled: true + +- name: Disable iwd + ansible.builtin.systemd: + name: iwd.service + enabled: false + +- name: Remove deprecated NetworkManager config + ansible.builtin.blockinfile: + path: /etc/NetworkManager/NetworkManager.conf + state: absent