From dca2e53442af24d61ca3809d40f5340429c76134 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sun, 11 Dec 2022 23:02:14 +0100 Subject: [PATCH] run a bunch of things on new Origan node --- cluster/staging/app/core/deploy/core-service.hcl | 4 ++-- cluster/staging/app/core/deploy/core-system.hcl | 2 +- cluster/staging/app/directory/deploy/directory.hcl | 2 +- cluster/staging/app/garage/deploy/garage-nix2.hcl | 2 +- cluster/staging/app/telemetry/deploy/telemetry-system.hcl | 2 +- cluster/staging/app/telemetry/deploy/telemetry.hcl | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cluster/staging/app/core/deploy/core-service.hcl b/cluster/staging/app/core/deploy/core-service.hcl index 29491b6..e2ec0a0 100644 --- a/cluster/staging/app/core/deploy/core-service.hcl +++ b/cluster/staging/app/core/deploy/core-service.hcl @@ -1,5 +1,5 @@ job "core-service" { - datacenters = ["neptune"] + datacenters = ["neptune", "jupiter"] type = "service" priority = 90 @@ -11,7 +11,7 @@ job "core-service" { config { packages = [ - "git+https://git.deuxfleurs.fr/lx/D53.git?ref=main&rev=b26d4d7bbad7c77f466a00f0bd21e7e4ea09c3b1" + "git+https://git.deuxfleurs.fr/lx/D53.git?ref=main&rev=5731ad022b62564d1364cb1928d261dac04f8914" ] command = "d53" } diff --git a/cluster/staging/app/core/deploy/core-system.hcl b/cluster/staging/app/core/deploy/core-system.hcl index 15dc77f..722423d 100644 --- a/cluster/staging/app/core/deploy/core-system.hcl +++ b/cluster/staging/app/core/deploy/core-system.hcl @@ -91,7 +91,7 @@ EOH user = "root" resources { - cpu = 2000 + cpu = 1000 memory = 200 } diff --git a/cluster/staging/app/directory/deploy/directory.hcl b/cluster/staging/app/directory/deploy/directory.hcl index 00b8022..1938ec5 100644 --- a/cluster/staging/app/directory/deploy/directory.hcl +++ b/cluster/staging/app/directory/deploy/directory.hcl @@ -1,5 +1,5 @@ job "directory" { - datacenters = ["dc1", "neptune"] + datacenters = ["neptune", "jupiter"] type = "service" priority = 90 diff --git a/cluster/staging/app/garage/deploy/garage-nix2.hcl b/cluster/staging/app/garage/deploy/garage-nix2.hcl index 6f1d770..b67f682 100644 --- a/cluster/staging/app/garage/deploy/garage-nix2.hcl +++ b/cluster/staging/app/garage/deploy/garage-nix2.hcl @@ -2,7 +2,7 @@ job "garage-staging" { type = "system" priority = 90 - datacenters = [ "neptune" ] + datacenters = [ "neptune", "jupiter" ] update { max_parallel = 1 diff --git a/cluster/staging/app/telemetry/deploy/telemetry-system.hcl b/cluster/staging/app/telemetry/deploy/telemetry-system.hcl index 7cbb01a..cf78053 100644 --- a/cluster/staging/app/telemetry/deploy/telemetry-system.hcl +++ b/cluster/staging/app/telemetry/deploy/telemetry-system.hcl @@ -1,5 +1,5 @@ job "telemetry-system" { - datacenters = ["neptune"] + datacenters = ["neptune", "jupiter"] type = "system" priority = "100" diff --git a/cluster/staging/app/telemetry/deploy/telemetry.hcl b/cluster/staging/app/telemetry/deploy/telemetry.hcl index b0dd5a2..4b9af55 100644 --- a/cluster/staging/app/telemetry/deploy/telemetry.hcl +++ b/cluster/staging/app/telemetry/deploy/telemetry.hcl @@ -1,5 +1,5 @@ job "telemetry" { - datacenters = ["neptune"] + datacenters = ["neptune", "jupiter"] type = "service" group "prometheus" { @@ -14,7 +14,7 @@ job "telemetry" { constraint { attribute = "${attr.unique.hostname}" operator = "set_contains_any" - value = "cariacou,carcajou" + value = "cariacou,origan" } task "prometheus" {