Skip to content
Snippets Groups Projects
Commit f0f504d0 authored by Pietsch, Martin's avatar Pietsch, Martin
Browse files

bugfix: static network addresses are not handled within DHCP networks

parent daa62f53
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,7 @@ export DISK_DEVICES ...@@ -29,7 +29,7 @@ export DISK_DEVICES
{% if ifdata.ipv4 is defined %} {% if ifdata.ipv4 is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp is defined %} {% if hostobj.network.classes[ifdata.class].dhcp is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp.ipv4 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" %} {% set ifresdata.ipv4_address = "DHCP" %}
{% else %} {% else %}
{% set ifresdata.ipv4_address = ifdata.ipv4 %} {% set ifresdata.ipv4_address = ifdata.ipv4 %}
...@@ -50,7 +50,7 @@ export DISK_DEVICES ...@@ -50,7 +50,7 @@ export DISK_DEVICES
{% if ifdata.ipv6 is defined %} {% if ifdata.ipv6 is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp is defined %} {% if hostobj.network.classes[ifdata.class].dhcp is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp.ipv6 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" %} {% set ifresdata.ipv6_address = "DHCP" %}
{% else %} {% else %}
{% set ifresdata.ipv6_address = ifdata.ipv6 %} {% set ifresdata.ipv6_address = ifdata.ipv6 %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment