From 47844f301924c58df4a2dd74abe273eea00f441c Mon Sep 17 00:00:00 2001
From: Raphael Dannecker <raphael.dannecker@steinbeisschule-reutlingen.de>
Date: Wed, 15 Nov 2023 13:46:35 +0100
Subject: [PATCH] extra network interface for TIA VM

---
 lmn-client.yml                    |  1 +
 roles/lmn_networkd/tasks/main.yml | 47 +++++++++++++++++++++++++++++++
 roles/lmn_vm/tasks/main.yml       | 17 +++++++----
 3 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 roles/lmn_networkd/tasks/main.yml

diff --git a/lmn-client.yml b/lmn-client.yml
index 2980123..dccce59 100644
--- a/lmn-client.yml
+++ b/lmn-client.yml
@@ -200,4 +200,5 @@
   roles:
     - role: lmn_wlan_iwd
       when: ansible_interfaces | select('search', 'wl.+') | first is defined
+    - lmn_networkd
     - lmn_localuser
diff --git a/roles/lmn_networkd/tasks/main.yml b/roles/lmn_networkd/tasks/main.yml
new file mode 100644
index 0000000..735f987
--- /dev/null
+++ b/roles/lmn_networkd/tasks/main.yml
@@ -0,0 +1,47 @@
+---
+# temporary disable network manager
+# in future network manager will be used for wifi sticks
+- name: Disable Networkmanager
+  ansible.builtin.systemd:
+    name: NetworkManager.service
+      #state: stopped
+    enabled: False
+
+      #- name: Use iwd but ignore wlan interfaces in NetworkManager
+      #  blockinfile:
+      #    dest: /etc/NetworkManager/NetworkManager.conf
+      #    block: |
+      #      [device]
+      #      wifi.backend=iwd
+      #      match-device=interface-name:en*
+      #      managed=0
+
+- name: Configure systemd-networkd ethernet.network
+  ansible.builtin.copy:
+    dest: /etc/systemd/network/ethernet.network
+    content: |
+       [Match]
+       Name=en*
+       [Network]
+       Bridge=virbr1
+
+- name: Configure systemd-networkd virbr1.netdev
+  ansible.builtin.copy:
+    dest: /etc/systemd/network/virbr1.netdev
+    content: |
+       [NetDev]
+       Name=virbr1
+       Kind=bridge
+
+- name: Configure systemd-networkd virbr1.network
+  ansible.builtin.copy:
+    dest: /etc/systemd/network/virbr1.network
+    content: |
+       [Match]
+       Name=virbr1
+       [Network]
+       DHCP=yes
+       [DHCPv4]
+       UseDomains=true
+       RouteMetric=512
+
diff --git a/roles/lmn_vm/tasks/main.yml b/roles/lmn_vm/tasks/main.yml
index 9c506a5..f013d5b 100644
--- a/roles/lmn_vm/tasks/main.yml
+++ b/roles/lmn_vm/tasks/main.yml
@@ -54,7 +54,7 @@
   lineinfile:
     path: /etc/libvirt/qemu/networks/default.xml
     line: '  <domain name="{{ ansible_domain }}" localOnly="no"/>'
-    insertafter: '<mac '
+    insertafter: '</ip>'
 
 - name: Autostart default network for VMs
   file:
@@ -158,12 +158,17 @@
     mode: '0644'
   notify: "enable vmimage-torrent.service"
 
+- name: Prepare directory for qemu bridge config
+  ansible.builtin.file:
+    path: /etc/qemu/
+    state: directory
+
 - name: Deploy bridge.conf needed for qemu session mode
-  lineinfile:
-    path: /etc/qemu/bridge.conf
-    line: 'allow virbr0'
-    create: True
-    mode: '0655'
+  ansible.builtin.copy:
+    dest: /etc/qemu/bridge.conf
+    content: |
+      allow virbr0
+      allow virbr1
 
 - name: Deploy rsync.secret
   lineinfile: