config: don't use location to select server for lxc containers
This commit is contained in:
parent
9255f76378
commit
cf3d9b4891
|
@ -137,7 +137,6 @@ in
|
|||
|
||||
dnscache = {
|
||||
role = "container";
|
||||
location = "server2";
|
||||
|
||||
interfaces.serv = {
|
||||
gw4 = "serv-gw";
|
||||
|
@ -310,7 +309,6 @@ in
|
|||
ctPillar = self.lib.saltPillarFor name;
|
||||
in {
|
||||
role = "container";
|
||||
location = "server2";
|
||||
|
||||
interfaces =
|
||||
builtins.mapAttrs (net: interface:
|
||||
|
|
|
@ -13,10 +13,9 @@ let
|
|||
|
||||
# Containers that are run on this host
|
||||
containers =
|
||||
lib.filterAttrs (_: { role, model, location, ... }:
|
||||
lib.filterAttrs (_: { role, model, ... }:
|
||||
role == "container" &&
|
||||
model == "lxc" &&
|
||||
location == hostName
|
||||
model == "lxc"
|
||||
) config.site.hosts;
|
||||
|
||||
enabled = containers != {};
|
||||
|
|
|
@ -4,10 +4,9 @@
|
|||
let
|
||||
# LXC containers on this host
|
||||
containers =
|
||||
lib.filterAttrs (_: { role, model, location, ... }:
|
||||
lib.filterAttrs (_: { role, model, ... }:
|
||||
role == "container" &&
|
||||
model == "lxc" &&
|
||||
location == hostName
|
||||
model == "lxc"
|
||||
) config.site.hosts;
|
||||
|
||||
# Every bridged veth network required by all containers
|
||||
|
|
Loading…
Reference in New Issue