Network devices are now only managed by NetworkManager.

Systemd-networkd is no longer used.
NetworkManager creates a MACVTAP device for each physical Ethernet device.
When calling vm-run with option macvtap, all macvtap-devices are passed to the VM.
This commit is contained in:
Raphael Dannecker 2024-05-23 09:58:41 +02:00
parent a8d74fce5b
commit 93d261e73b
4 changed files with 42 additions and 15 deletions

View file

@ -89,8 +89,6 @@
when: groups.localhome is defined and inventory_hostname in groups.localhome when: groups.localhome is defined and inventory_hostname in groups.localhome
- role: lmn_teacherlaptop - role: lmn_teacherlaptop
when: groups.teacherlaptop is defined and inventory_hostname in groups.teacherlaptop when: groups.teacherlaptop is defined and inventory_hostname in groups.teacherlaptop
- role: lmn_networkd
when: ansible_interfaces | select('search', 'enp.+') | length > 1
tasks: tasks:
## Temporary fixes and quirks: ## Temporary fixes and quirks:
@ -269,6 +267,13 @@
- /etc/sudoers.d/90-lmn-startvirtiofsd - /etc/sudoers.d/90-lmn-startvirtiofsd
- /etc/sudoers.d/90-lmn-link-images - /etc/sudoers.d/90-lmn-link-images
- /etc/rsync.secret - /etc/rsync.secret
- /etc/systemd/network/30-virbr1.netdev
- /etc/systemd/network/30-virbr2.netdev
- /etc/systemd/network/40-ethernet.network
- /etc/systemd/network/40-ethernet-usb.network
- /etc/systemd/network/50-virbr1.network
- /etc/systemd/network/50-virbr2.network
- /etc/systemd/network/60-wlan0-dhcp.network
- name: check if vm_usage_information.txt exists - name: check if vm_usage_information.txt exists
stat: path=/lmn/vm/vm_usage_information.txt stat: path=/lmn/vm/vm_usage_information.txt
@ -303,6 +308,12 @@
line: 'Listen 192.168.122.1:631' line: 'Listen 192.168.122.1:631'
state: absent state: absent
- name: Remove NetworkManager Ansible-Block for non-laptops
blockinfile:
path: /etc/NetworkManager/NetworkManager.conf
state: absent
when: groups.laptop is defined and inventory_hostname not in groups.laptop
## bookworm fixes/hacks: ## bookworm fixes/hacks:
- name: Work around sddm hang on shutdown - name: Work around sddm hang on shutdown
ansible.builtin.lineinfile: ansible.builtin.lineinfile:
@ -361,7 +372,6 @@
roles: roles:
- role: lmn_wlan_iwd - role: lmn_wlan_iwd
when: ansible_interfaces | select('search', 'wl.+') | first is defined when: ansible_interfaces | select('search', 'wl.+') | first is defined
- lmn_networkd
- lmn_localuser - lmn_localuser
tasks: tasks:
- name: Remove deprecated files and directories (laptop-class) - name: Remove deprecated files and directories (laptop-class)

View file

@ -19,6 +19,7 @@ options:
--os OS operating system (win10|linux|..) --os OS operating system (win10|linux|..)
--data-disk size additional data-disk --data-disk size additional data-disk
--bridge virbrX additional network interface on bridge virbrX --bridge virbrX additional network interface on bridge virbrX
--macvtap additional network interface on device macvtap
--options options additional options for virt-install command --options options additional options for virt-install command
EOF EOF
} }
@ -115,7 +116,7 @@ NO_VIEWER=0
source /etc/lmn/vm.conf source /etc/lmn/vm.conf
TEMP=$(getopt -o no:ps --long new,no-viewer,options:,persistent,system,memory:,data-disk:,heads:,cpu:,bridge:,os:,help -n $0 -- "$@") TEMP=$(getopt -o no:ps --long new,no-viewer,options:,persistent,system,memory:,data-disk:,heads:,cpu:,bridge:,macvtap,os:,help -n $0 -- "$@")
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
eval set -- "$TEMP" eval set -- "$TEMP"
@ -180,6 +181,15 @@ while true; do
fi fi
shift 2 shift 2
;; ;;
--macvtap )
for interface in $(ip link | sed -En 's/.*(macvtap-.*)@.*/\1/p'); do
mac="$(ip link | grep -A1 "${interface}" | \
sed -nE "s%\s+link/ether ([[:xdigit:]:]{17}) .+%\1%p")"
type="ethernet,mac=${mac},target.dev=${interface},xpath1.set=./target/@managed=no,model.type=virtio"
LIBVIRTOPTS="${LIBVIRTOPTS} --network type=$type"
done
shift
;;
--os ) --os )
LIBVIRTOSINFO=$2 LIBVIRTOSINFO=$2
shift 2 shift 2

View file

@ -215,29 +215,31 @@
- name: Configure macvtap interface - name: Configure macvtap interface
ansible.builtin.copy: ansible.builtin.copy:
dest: /etc/NetworkManager/system-connections/macvlan-vm-macvtap.nmconnection dest: "/etc/NetworkManager/system-connections/macvlan-vm-macvtap-{{ item }}.nmconnection"
mode: '0600' mode: '0600'
content: | content: |
[connection] [connection]
id=macvlan-vm-macvtap id=macvlan-macvtap-{{ item[3:9] }}
type=macvlan type=macvlan
interface-name=vm-macvtap interface-name=macvtap-{{ item[3:9] }}
[macvlan] [macvlan]
mode=2 mode=2
parent={{ ansible_default_ipv4['interface'] }} parent={{ item }}
tap=true tap=true
[ipv4] [ipv4]
method=disabled method=disabled
[ipv6] [ipv6]
method=disabled method=disabled
[proxy] [proxy]
loop: "{{ ansible_interfaces | select('search', '^enp.+') }}"
- name: Adjust interface permissions for user mode VMs - name: Adjust interface permissions for user mode VMs
ansible.builtin.copy: ansible.builtin.copy:
dest: /etc/udev/rules.d/80-macvlan.rules dest: /etc/udev/rules.d/80-macvlan.rules
content: | content: |
SUBSYSTEMS=="net", KERNELS=="vm-macvtap", MODE="0666" {% for interface in (ansible_interfaces | select('search', '^enp.+')) %}
SUBSYSTEMS=="net", KERNELS=="macvtap-{{ interface[3:9] }}", MODE="0666"
{% endfor %}
- name: Create directory for local .desktop-Files - name: Create directory for local .desktop-Files
ansible.builtin.file: ansible.builtin.file:

View file

@ -33,11 +33,16 @@
[Security] [Security]
Passphrase={{ wifipasswd }} Passphrase={{ wifipasswd }}
- name: Enable systemd-networkd - name: Use iwd (NetworkManager)
ansible.builtin.systemd: blockinfile:
name: systemd-networkd.service dest: /etc/NetworkManager/NetworkManager.conf
enabled: True block: |
[device]
match-device=interface-name:wl*
wifi.backend=iwd
[connection]
match-device=interface-name:wl*
ipv4.route-metric=2048
- name: Provide service to enable WiFi on boot - name: Provide service to enable WiFi on boot
ansible.builtin.copy: ansible.builtin.copy: