From 2b7f3987265c34b5d2cd3764acab118df4079dbc Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Tue, 7 May 2019 20:26:04 -0700 Subject: [PATCH] e2e: fix nomad service for systemd<230 --- e2e/terraform/shared/config/nomad.service | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/e2e/terraform/shared/config/nomad.service b/e2e/terraform/shared/config/nomad.service index 995d055e7..622b69a47 100644 --- a/e2e/terraform/shared/config/nomad.service +++ b/e2e/terraform/shared/config/nomad.service @@ -10,11 +10,15 @@ KillMode=process KillSignal=SIGINT LimitNOFILE=infinity LimitNPROC=infinity +TasksMax=infinity Restart=on-failure RestartSec=2 + +# systemd>=230 prefer StartLimitIntervalSec,StartLimitBurst in Unit, +# however Ubuntu 16.04 only has systemd==229. Use these old style settings +# as they will be supported by newer systemds. StartLimitBurst=3 -StartLimitIntervalSec=10 -TasksMax=infinity +StartLimitInterval=10 [Install] WantedBy=multi-user.target