public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/lxd: make start timeout configurable

Browse Source
This commit is contained in:
rnhmjoj 2021-02-28 14:02:42 +01:00
parent 4adcb00642
commit b9dc818bd5
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/virtualisation/lxd.nix
View File

@ -74,6 +74,17 @@ in {
for details. for details.
''; '';
}; };
startTimeout = mkOption {
type = types.int;
default = 600;
apply = toString;
description = ''
Time to wait (in seconds) for LXD to become ready to process requests.
If LXD does not reply within the configured time, lxd.service will be
considered failed and systemd will attempt to restart it.
'';
};
}; };
}; };
@ -120,7 +131,7 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd"; ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd";
ExecStartPost = "${cfg.package}/bin/lxd waitready --timeout=600"; ExecStartPost = "${cfg.package}/bin/lxd waitready --timeout=${cfg.startTimeout}";
ExecStop = "${cfg.package}/bin/lxd shutdown"; ExecStop = "${cfg.package}/bin/lxd shutdown";
KillMode = "process"; # when stopping, leave the containers alone KillMode = "process"; # when stopping, leave the containers alone
@ -130,7 +141,7 @@ in {
TasksMax = "infinity"; TasksMax = "infinity";
Restart = "on-failure"; Restart = "on-failure";
TimeoutStartSec = "600s"; TimeoutStartSec = "${cfg.startTimeout}s";
TimeoutStopSec = "30s"; TimeoutStopSec = "30s";
# By default, `lxd` loads configuration files from hard-coded # By default, `lxd` loads configuration files from hard-coded