From beacfb25fc1ef4a78415d93f97afeffb121a8ea2 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 22 Jul 2024 13:51:10 +0200 Subject: feat(infra): Ubuntu 24.04 LTS Signed-off-by: Peter Mikus Change-Id: I81e48360fcc970a16f1203955003d59f476b3233 (cherry picked from commit 586b271c3f3401c8901ee26a27e804483d71d6c7) --- fdio.infra.ansible/roles/nomad/defaults/main.yaml | 2 +- fdio.infra.ansible/roles/nomad/templates/consul.hcl.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'fdio.infra.ansible/roles/nomad') diff --git a/fdio.infra.ansible/roles/nomad/defaults/main.yaml b/fdio.infra.ansible/roles/nomad/defaults/main.yaml index 535db2bb2c..333d4763bd 100644 --- a/fdio.infra.ansible/roles/nomad/defaults/main.yaml +++ b/fdio.infra.ansible/roles/nomad/defaults/main.yaml @@ -134,7 +134,7 @@ nomad_consul_address: "localhost:8500" nomad_consul_token: "" nomad_consul_servers_service_name: "nomad" nomad_consul_clients_service_name: "nomad-client" -nomad_consul_tags: {} +nomad_consul_tags: "" nomad_consul_use_ssl: false # ACLs diff --git a/fdio.infra.ansible/roles/nomad/templates/consul.hcl.j2 b/fdio.infra.ansible/roles/nomad/templates/consul.hcl.j2 index a9c1aff7b2..c1fe878965 100644 --- a/fdio.infra.ansible/roles/nomad/templates/consul.hcl.j2 +++ b/fdio.infra.ansible/roles/nomad/templates/consul.hcl.j2 @@ -33,7 +33,7 @@ consul { # Specifies optional Consul tags to be registered with the Nomad server and # agent services. - tags = {{ nomad_consul_tags | to_json }} + tags = "{{ nomad_consul_tags }}" # Specifies the token used to provide a per-request ACL token. This option # overrides the Consul Agent's default token. If the token is not set here @@ -60,4 +60,4 @@ consul { {% endif %} } -{% endif %} \ No newline at end of file +{% endif %} -- cgit 1.2.3-korg