From 721cf5d42c21ff610fa57853796dc4d4876b531a Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Mon, 4 Dec 2023 12:17:35 +0100
Subject: [PATCH] interfaces: fix the templates.

---
 defaults/main.yml                    | 1 +
 templates/netplan-70-ansible.yaml.j2 | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 88028dd..c0915a4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -26,6 +26,7 @@ sysctl_custom_options: []
 #   sysctlfile_state: '{{ sysctl_custom_file_state }}'
 
 ubuntu_configure_additional_interfaces: false
+ubuntu_configure_additional_int_dhcp_overrides: true
 ubuntu_second_int_name: "enp4s0"
 ubuntu_netplan_interfaces:
   - name: "{{ ubuntu_second_int_name }}"
diff --git a/templates/netplan-70-ansible.yaml.j2 b/templates/netplan-70-ansible.yaml.j2
index 0b8f0fb..6603860 100644
--- a/templates/netplan-70-ansible.yaml.j2
+++ b/templates/netplan-70-ansible.yaml.j2
@@ -2,9 +2,9 @@ network:
     version: 2
     ethernets:
 {% for int in new_ints %}
-        {{ int.name }}:
-            dhcp4: {{ int.dhcp4 }}
-{% if int.dhcp_overrides | default(true) %}
+        {{ int }}:
+            dhcp4: true
+{% if ubuntu_configure_additional_int_dhcp_overrides | default(true) %}
             dhcp4-overrides:
               use-dns: false
               use-routes: false