fix(vrouter): allow dhcp proto for router interfaces

sandialabs · Jul 25, 2024 · 0ed5e59 · 0ed5e59
1 parent 09d1f08
commit 0ed5e59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/go/app/vrouter.go b/src/go/app/vrouter.go
@@ -171,7 +171,7 @@ func (this *Vrouter) PreStart(ctx context.Context, exp *types.Experiment) error
 		}
 
 		if strings.EqualFold(node.Hardware().OSType(), "linux") {
-			fmt.Printf("  === using OS Type 'linux' for Node Type %s is depricated ===\n", node.Type())
+			fmt.Printf("  === using OS Type 'linux' for Node Type %s is deprecated ===\n", node.Type())
 			fmt.Printf("  === use 'vyatta', 'vyos', or 'minirouter' OS type instead ===\n")
 		}
 

diff --git a/src/go/tmpl/templates/vyatta.tmpl b/src/go/tmpl/templates/vyatta.tmpl
@@ -11,7 +11,11 @@
 interfaces {
 {{ range $idx, $iface := $node.Network.Interfaces }}
     ethernet eth{{ $idx }} {
+        {{ if eq $iface.Proto "dhcp" }}
+        address dhcp
+        {{ else }}
         address {{ $iface.Address }}/{{ $iface.Mask }}
+        {{ end }}
         duplex auto
         {{ if and (ge $iface.MTU 68) (le $iface.MTU 16000) }}
         mtu {{ $iface.MTU }}