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

added IPv4 prefix to NETIF_* variables

parent efd3dcf1
No related branches found
No related tags found
No related merge requests found
......@@ -25,7 +25,7 @@ export DISK_DEVICES
{% set netifs = [] %}
{% for ifname, ifdata in hostobj.network.devices.items() %}
{% set ifresdata = namespace(ipv4_address = "", ipv4_netmask = "", ipv6_address = "", ipv6_prefix = "") %}
{% set ifresdata = namespace(ipv4_address = "", ipv4_netmask = "", ipv4_prefix = "", ipv6_address = "", ipv6_prefix = "") %}
{% if ifdata.ipv4 is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp is defined %}
{% if hostobj.network.classes[ifdata.class].dhcp.ipv4 is defined %}
......@@ -34,14 +34,17 @@ export DISK_DEVICES
{% else %}
{% set ifresdata.ipv4_address = ifdata.ipv4 %}
{% set ifresdata.ipv4_netmask = ('%s/%s' | format(ifdata.ipv4, hostobj.network.classes[ifdata.class].ipv4.prefix) | ipaddr('netmask')) %}
{% set ifresdata.ipv4_prefix = hostobj.network.classes[ifdata.class].ipv4.prefix %}
{% endif %}
{% else %}
{% set ifresdata.ipv4_address = ifdata.ipv4 %}
{% set ifresdata.ipv4_netmask = ('%s/%s' | format(ifdata.ipv4, hostobj.network.classes[ifdata.class].ipv4.prefix) | ipaddr('netmask')) %}
{% set ifresdata.ipv4_prefix = hostobj.network.classes[ifdata.class].ipv4.prefix %}
{% endif %}
{% else %}
{% set ifresdata.ipv4_address = ifdata.ipv4 %}
{% set ifresdata.ipv4_netmask = ('%s/%s' | format(ifdata.ipv4, hostobj.network.classes[ifdata.class].ipv4.prefix) | ipaddr('netmask')) %}
{% set ifresdata.ipv4_prefix = hostobj.network.classes[ifdata.class].ipv4.prefix %}
{% endif %}
{% endif %}
{% if ifdata.ipv6 is defined %}
......@@ -62,7 +65,7 @@ export DISK_DEVICES
{% set ifresdata.ipv6_prefix = hostobj.network.classes[ifdata.class].ipv6.prefix %}
{% endif %}
{% endif %}
{{ 'export NETIF_%s="%s;%s;%s;%s;%s"' | format(ifname | upper, ifresdata.ipv4_address, ifresdata.ipv4_netmask, ifresdata.ipv6_address, ifresdata.ipv6_prefix, ifdata.static | default("true")) }}
{{ 'export NETIF_%s="%s;%s;%s;%s;%s;%s"' | format(ifname | upper, ifresdata.ipv4_address, ifresdata.ipv4_netmask, ifresdata.ipv4_prefix, ifresdata.ipv6_address, ifresdata.ipv6_prefix, ifdata.static | default("true")) }}
{% do netifs.append('"%s"' | format(ifname)) %}
{% endfor %}
declare -a NETIF_DEVICES=({{ netifs | join(" ") }})
......
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