From f0f504d0a4ed04ead6201df71caf5132c2134662 Mon Sep 17 00:00:00 2001
From: Martin Pietsch <martin.pietsch@tu-dresden.de>
Date: Mon, 14 Dec 2020 10:47:54 +0100
Subject: [PATCH] bugfix: static network addresses are not handled within DHCP
networks
---
templates/answerfile.j2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/answerfile.j2 b/templates/answerfile.j2
index 956f9d6..ebfee14 100644
--- a/templates/answerfile.j2
+++ b/templates/answerfile.j2
@@ -29,7 +29,7 @@ export DISK_DEVICES
{% if ifdata.ipv4 is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp.ipv4 is defined %}
-{% if (ifdata.ipv4 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv4.from, hostobj.network.classes[ifdata.class].dhcp.ipv4.to))) == true %}
+{% if (ifdata.ipv4 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv4.from, hostobj.network.classes[ifdata.class].dhcp.ipv4.to))) == true and ifdata.static == False %}
{% set ifresdata.ipv4_address = "DHCP" %}
{% else %}
{% set ifresdata.ipv4_address = ifdata.ipv4 %}
@@ -50,7 +50,7 @@ export DISK_DEVICES
{% if ifdata.ipv6 is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp.ipv6 is defined %}
-{% if (ifdata.ipv6 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv6.from, hostobj.network.classes[ifdata.class].dhcp.ipv6.to))) == true %}
+{% if (ifdata.ipv6 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv6.from, hostobj.network.classes[ifdata.class].dhcp.ipv6.to))) == true and ifdata.static == False %}
{% set ifresdata.ipv6_address = "DHCP" %}
{% else %}
{% set ifresdata.ipv6_address = ifdata.ipv6 %}
--
GitLab