Merge branch 'fvs-wlanstick-feature' into fvs

roles/lmn_networkd/tasks/main.yml

@@ -1,38 +1,67 @@
 ---
 # temporary disable network manager
 # in future network manager will be used for wifi sticks
-- name: Disable Networkmanager
+- name: Use iwd but ignore interfaces managed by systemd-networkd (wlan0,en*)
+  blockinfile:
+    dest: /etc/NetworkManager/NetworkManager.conf
+    block: |
+      [device]
+      match-device=interface-name:wlx*
+      wifi.backend=iwd
+      [connection]
+      match-device=interface-name:wlx*
+      ipv4.route-metric=2048
+      [keyfile]
+      unmanaged-devices=interface-name:wlan0;interface-name:en*;interface-name:vm*
+
+- name: Enable Networkmanager
   ansible.builtin.systemd:
     name: NetworkManager.service
-      #state: stopped
-    enabled: False
+      #state: started
+    enabled: true
 
-      #- 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: install firmware for wifi-sticks
+  apt:
+    name:
+      - firmware-realtek
+    state: latest
+    autoremove: true
 
 - name: Configure systemd-networkd virbr1.netdev
   ansible.builtin.copy:
-    dest: /etc/systemd/network/30-virbr1.netdev
+    dest: "/etc/systemd/network/30-{{ item }}.netdev"
     content: |
        [NetDev]
-       Name=virbr1
+       Name={{ item }}
        Kind=bridge
+  loop:
+    - virbr1
+    - virbr2
+
+- name: Set MAC-Address of virtio1 to ethernet nic
+  ansible.builtin.lineinfile:
+    path: /etc/systemd/network/30-virbr1.netdev
+    line: "MACAddress={{ ansible_facts[ansible_interfaces | select('search', '^en.*') | first].macaddress }}"
+  when: ansible_interfaces | select('search', '^en.*')
 
 - name: Configure systemd-networkd ethernet.network
   ansible.builtin.copy:
     dest: /etc/systemd/network/40-ethernet.network
     content: |
        [Match]
-       Name=en*
+       Name=enp*
        [Network]
        Bridge=virbr1
 
+- name: Configure systemd-networkd ethernet-usb.network
+  ansible.builtin.copy:
+    dest: /etc/systemd/network/40-ethernet-usb.network
+    content: |
+       [Match]
+       Name=enx*
+       [Network]
+       Bridge=virbr2
+
 - name: Configure systemd-networkd virbr1.network
   ansible.builtin.copy:
     dest: /etc/systemd/network/50-virbr1.network
@@ -44,3 +73,26 @@
        [DHCPv4]
        UseDomains=true
        RouteMetric=512
+
+- name: Configure systemd-networkd virbr2.network
+  ansible.builtin.copy:
+    dest: /etc/systemd/network/50-virbr2.network
+    content: |
+       [Match]
+       Name=virbr2
+       [Network]
+       DHCP=yes
+       [DHCPv4]
+       UseDomains=false
+       RouteMetric=2048
+
+- name: Configure systemd-networkd wlan.network
+  ansible.builtin.copy:
+    dest: /etc/systemd/network/60-wlan0-dhcp.network
+    content: |
+       [Match]
+       Name=wlan0
+       [Network]
+       DHCP=yes
+       [DHCPv4]
+       UseDomains=true

roles/lmn_wlan_iwd/tasks/main.yml

@@ -31,26 +31,26 @@
       [Security]
       Passphrase={{ wifipasswd }}
 
-- name: Use iwd but ignore wlan interfaces in NetworkManager
-  blockinfile:
-    dest: /etc/NetworkManager/NetworkManager.conf
-    block: |
-      [device]
-      wifi.backend=iwd
-      match-device=interface-name:wl*
-      managed=0
-
-- name: Configure systemd-networkd
-  ansible.builtin.copy:
-    dest: /etc/systemd/network/80-wlan-dhcp.network
-    content: |
-      [Match]
-      Name=wl*
-      [Network]
-      DHCP=yes
-      [DHCPv4]
-      UseDomains=true
-
+      # - name: Use iwd but ignore wlan interfaces in NetworkManager
+      #   blockinfile:
+      #     dest: /etc/NetworkManager/NetworkManager.conf
+      #     block: |
+      #       [device]
+      #       wifi.backend=iwd
+      #       match-device=interface-name:wl*
+      #       managed=0
+      # 
+      # - name: Configure systemd-networkd
+      #   ansible.builtin.copy:
+      #     dest: /etc/systemd/network/80-wlan-dhcp.network
+      #     content: |
+      #       [Match]
+      #       Name=wl*
+      #       [Network]
+      #       DHCP=yes
+      #       [DHCPv4]
+      #       UseDomains=true
+      # 
 - name: Enable systemd-networkd
   ansible.builtin.systemd:
     name: systemd-networkd.service