Compare commits
2 commits
b541b78145
...
b9ef9ac91d
Author | SHA1 | Date | |
---|---|---|---|
b9ef9ac91d | |||
1b68df7229 |
2 changed files with 16 additions and 16 deletions
|
@ -31,7 +31,7 @@ rec {
|
|||
|
||||
# Collect a list of attribute sets into an attribute set.
|
||||
# Merge order depends on attrValues iteration order and foldl.
|
||||
chainAttrs = attrs: foldl (a: b: a // b) (builtins.attrValues attrs);
|
||||
chainAttrs = attrs: foldl (a: b: a // b) { } (builtins.attrValues attrs);
|
||||
|
||||
# Given an attribute set of an attribute set of items, does it describe a valid partition of some global set?
|
||||
# This does not check for completeness.
|
||||
|
|
|
@ -131,8 +131,8 @@ in
|
|||
# TODO: do not hardcode, just reuse the Colmena hive module outputs to generate all the required details.
|
||||
]
|
||||
++ (map (index: record "bm-${toString index}.wob01.infra" 300 "AAAA" "2a01:584:11::1:${toString index}") (genList lib.id 11))
|
||||
++ (map (node: record "builder-${toString node.config.bagel.baremetal.builders.num}.wob01.infra" 300 "CNAME" "bm-${toString node.config.bagel.baremetal.num}") builderNodes)
|
||||
++ (map (node: record "storage-${toString node.config.bagel.baremetal.storage.num}.wob01.infra" 300 "CNAME" "bm-${toString node.config.bagel.baremetal.num}") storageNodes)
|
||||
++ (map (node: record "builder-${toString node.config.bagel.baremetal.builders.num}.wob01.infra" 300 "CNAME" "bm-${toString node.config.bagel.baremetal.num}.wob01.infra.forkos.org") builderNodes)
|
||||
++ (map (node: record "storage-${toString node.config.bagel.baremetal.storage.num}.wob01.infra" 300 "CNAME" "bm-${toString node.config.bagel.baremetal.num}.wob01.infra.forkos.org") storageNodes)
|
||||
++ (
|
||||
let
|
||||
# FIXME: figure out a way to poke `config.services.s3-revproxy` and
|
||||
|
|
Loading…
Reference in a new issue