kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't use net.IPMask

Browse Source 
net.IPMask doesn't have any advantages, as it would
marshalled to
mask:
  - 1
  - 2
  - 3
  - 4

Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2024-07-17 15:47:45 +02:00
committed by Jonathon Anderson
parent 9fdb9ca792
commit c08cd82e68
7 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww
View File

@@ -52,9 +52,9 @@ mtu={{ $netdev.MTU }}
{{ end -}}
{{ end -}}
{{ if and ($netdev.Ipaddr) (ne $netdev.Type "bond-slave") -}}
{{ if and ($netdev.IpCIDR) (ne $netdev.Type "bond-slave") -}}
[ipv4]
address={{ $netdev.Ipaddr }}
address={{ $netdev.IpCIDR }}
{{ if $netdev.Gateway -}}
gateway={{ $netdev.Gateway }}
{{ end -}}

2
overlays/wicked/rootfs/etc/wicked/ifconfig/ifcfg.xml.ww
View File

@@ -24,7 +24,7 @@ This file is autogenerated by warewulf
</ipv4>
<ipv4:static>
<address>
<local>{{$netdev.Ipaddr}}/{{$netdev.Ipmask}}</local>
<local>{{$netdev.IpCIDR}}</local>
</address>
{{ if $netdev.Gateway.Get -}}
<route>