legacy: implement "*" for salt-pillar lookup
This commit is contained in:
parent
37dd4550bb
commit
3d2cfa4e8a
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
mainServer = "server1";
|
||||
pillar = self.lib.saltPillarFor mainServer;
|
||||
pillar = self.lib.saltPillarFor "*";
|
||||
|
||||
renameAttr = from: to: attrset:
|
||||
builtins.foldl' (result: name:
|
||||
|
|
|
@ -12,15 +12,19 @@ let
|
|||
globToRegex = builtins.replaceStrings ["*"] [".*"];
|
||||
|
||||
baseMatches =
|
||||
builtins.filter (patterns:
|
||||
pkgs.lib.any (pattern:
|
||||
builtins.match (globToRegex pattern) hostName != null
|
||||
) (
|
||||
builtins.filter builtins.isString (
|
||||
builtins.split " or " patterns
|
||||
if hostName == "*"
|
||||
then
|
||||
builtins.attrNames pillarBase
|
||||
else
|
||||
builtins.filter (patterns:
|
||||
pkgs.lib.any (pattern:
|
||||
builtins.match (globToRegex pattern) hostName != null
|
||||
) (
|
||||
builtins.filter builtins.isString (
|
||||
builtins.split " or " patterns
|
||||
)
|
||||
)
|
||||
)
|
||||
) (builtins.attrNames pillarBase);
|
||||
) (builtins.attrNames pillarBase);
|
||||
|
||||
fileIds = builtins.foldl' (result: matchName:
|
||||
result ++ pillarBase.${matchName}
|
||||
|
|
Loading…
Reference in New Issue