From c408c346a474b46200d903bf134fd35b34d6ddfa Mon Sep 17 00:00:00 2001 From: John Burwell Date: Sat, 26 Apr 2025 15:03:50 -0500 Subject: [PATCH] Bridging wlan is not supported? oh well --- .../tasks/systemd_networking_devices.yml | 24 ++----------------- .../roles/networking/templates/br0.netdev.j2 | 3 --- .../roles/networking/templates/br0.network.j2 | 15 ------------ .../networking/templates/wlan0.network.j2 | 12 +++++++++- 4 files changed, 13 insertions(+), 41 deletions(-) delete mode 100644 ansible/roles/networking/templates/br0.netdev.j2 delete mode 100644 ansible/roles/networking/templates/br0.network.j2 diff --git a/ansible/roles/networking/tasks/systemd_networking_devices.yml b/ansible/roles/networking/tasks/systemd_networking_devices.yml index 1d9c881..a053076 100644 --- a/ansible/roles/networking/tasks/systemd_networking_devices.yml +++ b/ansible/roles/networking/tasks/systemd_networking_devices.yml @@ -1,25 +1,5 @@ --- -# Create the bridge device (br0) -- name: Deploy br0 systemd-networkd bridge device (netdev) - ansible.builtin.template: - src: br0.netdev.j2 - dest: /etc/systemd/network/br0.netdev - owner: root - group: root - mode: "0644" - notify: Restart systemd-networkd - -# Configure br0 (assign IP and start DHCP server) -- name: Deploy br0 systemd-networkd network config - ansible.builtin.template: - src: br0.network.j2 - dest: /etc/systemd/network/br0.network - owner: root - group: root - mode: "0644" - notify: Restart systemd-networkd - -# Configure wlan0 to be a bridge device +# Configure wlan0 - name: Deploy wlan0 systemd-networkd bridge config ansible.builtin.template: src: wlan0.network.j2 @@ -29,7 +9,7 @@ mode: "0644" notify: Restart systemd-networkd -# Configure eth0 to be a bridge device +# Configure eth0 - name: Deploy eth0 systemd-networkd bridge config ansible.builtin.template: src: eth0.network.j2 diff --git a/ansible/roles/networking/templates/br0.netdev.j2 b/ansible/roles/networking/templates/br0.netdev.j2 deleted file mode 100644 index 6ec2b6d..0000000 --- a/ansible/roles/networking/templates/br0.netdev.j2 +++ /dev/null @@ -1,3 +0,0 @@ -[NetDev] -Name=br0 -Kind=bridge diff --git a/ansible/roles/networking/templates/br0.network.j2 b/ansible/roles/networking/templates/br0.network.j2 deleted file mode 100644 index 6774f04..0000000 --- a/ansible/roles/networking/templates/br0.network.j2 +++ /dev/null @@ -1,15 +0,0 @@ -[Match] -Name=br0 - -[Network] -Address={{ network.lan_gateway }} -DHCPServer=yes -IPMasquade=ipv4 -MulticastDNS=yes -LLMNR=yes - -[DHCPServer] -PoolOffset=100 -PoolSize=100 -DNS={{ network.lan_dns }} -DomainName={{ network.lan_domain }} diff --git a/ansible/roles/networking/templates/wlan0.network.j2 b/ansible/roles/networking/templates/wlan0.network.j2 index 9341f2f..3f0db87 100644 --- a/ansible/roles/networking/templates/wlan0.network.j2 +++ b/ansible/roles/networking/templates/wlan0.network.j2 @@ -2,4 +2,14 @@ Name=wlan0 [Network] -Bridge=br0 +Address={{ network.lan_gateway }} +DHCPServer=yes +IPMasquade=ipv4 +MulticastDNS=yes +LLMNR=yes + +[DHCPServer] +PoolOffset=100 +PoolSize=100 +DNS={{ network.lan_dns }} +DomainName={{ network.lan_domain }}