From 0995761cf658eb47425300c02f03c9b844d86caa Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 14 Nov 2023 10:02:44 +0100 Subject: [PATCH] New variable networking_main_iface --- defaults/main.yml | 2 ++ templates/networking.j2 | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b274db9..f468528 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,3 +4,5 @@ ssh_authorized_keys_extra: [] watchdog_reboot_timer: 16 watchdog_reset_timer: 10 + +networking_main_iface: "eth0" diff --git a/templates/networking.j2 b/templates/networking.j2 index bededb7..8d555b2 100644 --- a/templates/networking.j2 +++ b/templates/networking.j2 @@ -6,16 +6,16 @@ iface lo inet loopback {% endif %} # The main interface -auto eth0 +auto {{ networking_main_iface }} {% if bridged_network is defined and bridged_network %} auto br0 iface br0 - requires eth0{% if bridged_network != "true" %} {{ bridged_network }}{% endif +%} - bridge-ports eth0{% if bridged_network != "true" %} {{ bridged_network }}{% endif +%} + requires {{ networking_main_iface }}{% if bridged_network != "true" %} {{ bridged_network }}{% endif +%} + bridge-ports {{ networking_main_iface }}{% if bridged_network != "true" %} {{ bridged_network }}{% endif +%} bridge-fd 0 bridge-stp off {% else %} -iface eth0 +iface {{ networking_main_iface }} {% endif %} {% if hw_address is defined %} hwaddress ether {{ hw_address }} @@ -33,7 +33,7 @@ iface eth0 {% if bridged_network is defined and bridged_network %} up echo 0 > /proc/sys/net/ipv6/conf/br0/accept_ra {% else %} - pre-up echo 0 > /proc/sys/net/ipv6/conf/eth0/accept_ra + pre-up echo 0 > /proc/sys/net/ipv6/conf/{{ networking_main_iface }}/accept_ra {% endif %} {% else %} address {{ wanted_ip6 }}/128