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