lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modules: misc: Switch type to list of strings

Browse Source 
The DNS entry should be a list of strings. We would have caught this
earlier but this helped us find a type unification issue.
This commit is contained in:
James Shubin
2025-01-17 23:22:52 -05:00
parent 86b95b2c0b
commit 8e8e831e73
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/misc/main.mcl
View File

@@ -28,6 +28,7 @@
# additional permission. # additional permission.
import "golang" import "golang"
import "golang/strings"
import "net" import "net"
import "os" import "os"
@@ -99,9 +100,10 @@ class network_manager_static($st) {
$ip = net.cidr_to_ip($cidr) $ip = net.cidr_to_ip($cidr)
$prefix = net.cidr_to_prefix($cidr) $prefix = net.cidr_to_prefix($cidr)
$router = $st->router || "" $router = $st->router || ""
$dns = $st->dns || "8.8.8.8" $dns = $st->dns || ["8.8.8.8",]
$vips []str = $st->vips || [] # []cidr $vips []str = $st->vips || [] # []cidr
$dns_str = strings.join($dns, ";") # the line also ends with a semicolon
$tmpl = $tmpl =
" "
[connection] [connection]
@@ -125,7 +127,9 @@ address1=${ip}/${prefix}
address{{ $ix }}={{ $ip }} address{{ $ix }}={{ $ip }}
{{ end -}} {{ end -}}
{{ end -}} {{ end -}}
dns=${dns}; {{ if .dns -}}
dns=${dns_str};
{{ end -}}
dns-search= dns-search=
may-fail=false may-fail=false
method=manual method=manual
@@ -140,6 +144,7 @@ mac-address={{ .mac }}
uuid => $uuid, uuid => $uuid,
mac => $mac, mac => $mac,
router => $router, router => $router,
dns => $dns,
vips => $vips, vips => $vips,
} }