Add overlay variable NetworkCIDR6

Signed-off-by: Timothy Middelkoop <tmiddelkoop@internet2.edu>

overlays/debug/internal/debug_test.go

@@ -93,10 +93,11 @@ data from other structures.
 - Netmask: 255.255.255.0
 - Network: 192.168.0.0
 - NetworkCIDR: 192.168.0.0/24
-- Ipaddr6: 
-- IpCIDR6: 
-- PrefixLen6: 
-- Ipv6: false
+- Ipaddr6: 2001:db8::1
+- PrefixLen6: 64
+- IpCIDR6: 2001:db8::1/64
+- NetworkCIDR6: 2001:db8::/64
+- Ipv6: true
 
 ### DHCP
 
@@ -180,8 +181,8 @@ node methods in addition to its fields.
   - Netmask: 255.255.255.0
   - Gateway: 192.168.3.1
   - Ipaddr6: <nil>
-  - IpCIDR6: 
   - PrefixLen6: 
+  - IpCIDR6: 
   - Gateway6: <nil>
   - MTU: 
   - Primary: false
@@ -195,8 +196,8 @@ node methods in addition to its fields.
   - Netmask: 255.255.255.0
   - Gateway: 192.168.3.1
   - Ipaddr6: <nil>
-  - IpCIDR6: 
   - PrefixLen6: 
+  - IpCIDR6: 
   - Gateway6: <nil>
   - MTU: 
   - Primary: false
@@ -211,10 +212,10 @@ node methods in addition to its fields.
   - Ipaddr: <nil>
   - Netmask: <nil>
   - Gateway: <nil>
-  - Ipaddr6: fd00:10::3
-  - IpCIDR6: fd00:10::3/64
+  - Ipaddr6: 2001:db8::3
   - PrefixLen6: 64
-  - Gateway6: fd00:10::1
+  - IpCIDR6: 2001:db8::3/64
+  - Gateway6: 2001:db8::1
   - MTU: 
   - Primary: false
   - Tags:

overlays/debug/internal/nodes.conf

@@ -54,9 +54,9 @@ nodes:
       tertiary:
         device: wwnet3
         hwaddr: 9a:77:29:73:14:f8
-        ipaddr6: fd00:10::3
+        ipaddr6: 2001:db8::3
         prefixlen6: 64
-        gateway6: fd00:10::1
+        gateway6: 2001:db8::1
     ipmi:
       username: user
       password: password

overlays/debug/internal/warewulf.conf

@@ -1 +1,2 @@
 ipaddr: 192.168.0.1/24
+ipaddr6: 2001:db8::1/64

overlays/debug/rootfs/tstruct.md.ww

@@ -34,8 +34,9 @@ data from other structures.
 - Network: {{ .Network }}
 - NetworkCIDR: {{ .NetworkCIDR }}
 - Ipaddr6: {{ .Ipaddr6 }}
-- IpCIDR6: {{ .IpCIDR6 }}
 - PrefixLen6: {{ .PrefixLen6 }}
+- IpCIDR6: {{ .IpCIDR6 }}
+- NetworkCIDR6: {{ .NetworkCIDR6 }}
 - Ipv6: {{ .Ipv6 }}
 
 ### DHCP
@@ -125,8 +126,8 @@ node methods in addition to its fields.
   - Netmask: {{ $netdev.Netmask }}
   - Gateway: {{ $netdev.Gateway }}
   - Ipaddr6: {{ $netdev.Ipaddr6 }}
-  - IpCIDR6: {{ $netdev.IpCIDR6 }}
   - PrefixLen6: {{ $netdev.PrefixLen6 }}
+  - IpCIDR6: {{ $netdev.IpCIDR6 }}
   - Gateway6: {{ $netdev.Gateway6 }}
   - MTU: {{ $netdev.MTU }}
   - Primary: {{ $netdev.Primary }}