From 727f9319ab461c2d1d944e288a13b3cb10c5f7c4 Mon Sep 17 00:00:00 2001 From: James Rasell Date: Tue, 28 Jan 2025 14:33:17 +0000 Subject: [PATCH] e2e: Ensure Consul client is running before starting Nomad service. --- .../provision-nomad/etc/consul.d/consul.service | 1 + .../provision-nomad/etc/nomad.d/nomad-client.service | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/e2e/terraform/provision-infra/provision-nomad/etc/consul.d/consul.service b/e2e/terraform/provision-infra/provision-nomad/etc/consul.d/consul.service index 2f1e9f24ed1..56ecccb8c32 100644 --- a/e2e/terraform/provision-infra/provision-nomad/etc/consul.d/consul.service +++ b/e2e/terraform/provision-infra/provision-nomad/etc/consul.d/consul.service @@ -4,6 +4,7 @@ Requires=network-online.target After=network-online.target [Service] +Type=notify Restart=on-failure Environment=CONSUL_ALLOW_PRIVILEGED_PORTS=true WorkingDirectory=/etc/consul.d diff --git a/e2e/terraform/provision-infra/provision-nomad/etc/nomad.d/nomad-client.service b/e2e/terraform/provision-infra/provision-nomad/etc/nomad.d/nomad-client.service index ef6a95e14a2..5433f87554d 100644 --- a/e2e/terraform/provision-infra/provision-nomad/etc/nomad.d/nomad-client.service +++ b/e2e/terraform/provision-infra/provision-nomad/etc/nomad.d/nomad-client.service @@ -5,6 +5,12 @@ After=network-online.target StartLimitIntervalSec=0 StartLimitBurst=3 +# Nomad and Consul are started very closely together. This helps ensure Consul +# is already running before Nomad starts and avoids having to SIGHUP the Nomad +# clients in order to reload the Consul fingerprints. +Wants=consul.service +After=consul.service + [Service] User=root ExecReload=/bin/kill -HUP $MAINPID