From a490f082bc4bb58fbd54aa5e38334034ac54e761 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 4 Sep 2023 19:05:18 +0200 Subject: prod: remove all apps from orion, add some missing in scorpio --- cluster/prod/app/backup/deploy/backup-daily.hcl | 2 +- cluster/prod/app/backup/deploy/backup-garage.hcl | 2 +- cluster/prod/app/backup/deploy/backup-weekly.hcl | 2 +- cluster/prod/app/bagage/deploy/bagage.hcl | 2 +- cluster/prod/app/cms/deploy/cms.hcl | 2 +- cluster/prod/app/core/deploy/bottin.hcl | 2 +- cluster/prod/app/core/deploy/d53.hcl | 2 +- cluster/prod/app/core/deploy/diplonat.hcl | 2 +- cluster/prod/app/core/deploy/tricot.hcl | 2 +- cluster/prod/app/coturn/deploy/coturn.hcl | 2 +- cluster/prod/app/drone-ci/deploy/server.hcl | 2 +- cluster/prod/app/garage/deploy/garage.hcl | 2 +- cluster/prod/app/guichet/deploy/directory.hcl | 2 +- cluster/prod/app/matrix/deploy/im.hcl | 2 +- cluster/prod/app/plume/deploy/plume.hcl | 2 +- cluster/prod/app/postgres/deploy/postgres.hcl | 6 +++--- cluster/prod/app/telemetry/deploy/telemetry-service.hcl | 2 +- cluster/prod/app/telemetry/deploy/telemetry-system.hcl | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cluster/prod/app/backup/deploy/backup-daily.hcl b/cluster/prod/app/backup/deploy/backup-daily.hcl index 871a393..947bc73 100644 --- a/cluster/prod/app/backup/deploy/backup-daily.hcl +++ b/cluster/prod/app/backup/deploy/backup-daily.hcl @@ -1,5 +1,5 @@ job "backup_daily" { - datacenters = ["orion", "neptune", "scorpio"] + datacenters = ["neptune", "scorpio", "bespin"] type = "batch" priority = "60" diff --git a/cluster/prod/app/backup/deploy/backup-garage.hcl b/cluster/prod/app/backup/deploy/backup-garage.hcl index f9d64d1..7855c51 100644 --- a/cluster/prod/app/backup/deploy/backup-garage.hcl +++ b/cluster/prod/app/backup/deploy/backup-garage.hcl @@ -1,5 +1,5 @@ job "backup-garage" { - datacenters = ["neptune", "bespin"] + datacenters = ["neptune", "bespin", "scorpio"] type = "batch" priority = "60" diff --git a/cluster/prod/app/backup/deploy/backup-weekly.hcl b/cluster/prod/app/backup/deploy/backup-weekly.hcl index 6a00507..718b2ea 100644 --- a/cluster/prod/app/backup/deploy/backup-weekly.hcl +++ b/cluster/prod/app/backup/deploy/backup-weekly.hcl @@ -1,5 +1,5 @@ job "backup_weekly" { - datacenters = ["orion", "neptune", "bespin"] + datacenters = ["scorpio", "neptune", "bespin"] type = "batch" priority = "60" diff --git a/cluster/prod/app/bagage/deploy/bagage.hcl b/cluster/prod/app/bagage/deploy/bagage.hcl index c9b7781..e3e6012 100644 --- a/cluster/prod/app/bagage/deploy/bagage.hcl +++ b/cluster/prod/app/bagage/deploy/bagage.hcl @@ -1,5 +1,5 @@ job "bagage" { - datacenters = ["orion", "neptune"] + datacenters = ["scorpio", "neptune"] type = "service" priority = 90 diff --git a/cluster/prod/app/cms/deploy/cms.hcl b/cluster/prod/app/cms/deploy/cms.hcl index 1f9f072..71192d2 100644 --- a/cluster/prod/app/cms/deploy/cms.hcl +++ b/cluster/prod/app/cms/deploy/cms.hcl @@ -1,5 +1,5 @@ job "cms" { - datacenters = ["neptune", "orion"] + datacenters = ["neptune", "scorpio"] type = "service" priority = 100 diff --git a/cluster/prod/app/core/deploy/bottin.hcl b/cluster/prod/app/core/deploy/bottin.hcl index a7d8694..e21eb72 100644 --- a/cluster/prod/app/core/deploy/bottin.hcl +++ b/cluster/prod/app/core/deploy/bottin.hcl @@ -1,5 +1,5 @@ job "core-bottin" { - datacenters = ["orion", "neptune", "scorpio"] + datacenters = ["neptune", "scorpio"] type = "system" priority = 90 diff --git a/cluster/prod/app/core/deploy/d53.hcl b/cluster/prod/app/core/deploy/d53.hcl index 81a88ff..74e18d5 100644 --- a/cluster/prod/app/core/deploy/d53.hcl +++ b/cluster/prod/app/core/deploy/d53.hcl @@ -1,5 +1,5 @@ job "core-d53" { - datacenters = ["neptune", "orion", "bespin"] + datacenters = ["neptune", "scorpio", "bespin"] type = "service" priority = 90 diff --git a/cluster/prod/app/core/deploy/diplonat.hcl b/cluster/prod/app/core/deploy/diplonat.hcl index 078e811..6f2b796 100644 --- a/cluster/prod/app/core/deploy/diplonat.hcl +++ b/cluster/prod/app/core/deploy/diplonat.hcl @@ -1,5 +1,5 @@ job "core-diplonat" { - datacenters = ["orion", "neptune", "scorpio", "bespin"] + datacenters = ["neptune", "scorpio", "bespin"] type = "system" priority = 90 diff --git a/cluster/prod/app/core/deploy/tricot.hcl b/cluster/prod/app/core/deploy/tricot.hcl index c165f08..24f4d01 100644 --- a/cluster/prod/app/core/deploy/tricot.hcl +++ b/cluster/prod/app/core/deploy/tricot.hcl @@ -3,7 +3,7 @@ job "core-tricot" { # on pourra mettre bespin quand on aura migré gitea de la vm vers le cluster # en attendant, les deux ne sont pas capables de partager les certificats SSL # donc on laisse la VM gitea gérer les certifs et prendre tout le trafic http(s) - datacenters = ["orion", "neptune", "scorpio"] + datacenters = ["neptune", "scorpio"] type = "system" priority = 90 diff --git a/cluster/prod/app/coturn/deploy/coturn.hcl b/cluster/prod/app/coturn/deploy/coturn.hcl index 2a48f3c..bc92ef8 100644 --- a/cluster/prod/app/coturn/deploy/coturn.hcl +++ b/cluster/prod/app/coturn/deploy/coturn.hcl @@ -1,5 +1,5 @@ job "coturn" { - datacenters = ["neptune", "orion"] + datacenters = ["neptune", "scorpio"] type = "service" priority = 100 diff --git a/cluster/prod/app/drone-ci/deploy/server.hcl b/cluster/prod/app/drone-ci/deploy/server.hcl index 8177193..99e95f6 100644 --- a/cluster/prod/app/drone-ci/deploy/server.hcl +++ b/cluster/prod/app/drone-ci/deploy/server.hcl @@ -1,5 +1,5 @@ job "drone-ci" { - datacenters = ["neptune", "orion"] + datacenters = ["neptune", "scorpio"] type = "service" group "server" { diff --git a/cluster/prod/app/garage/deploy/garage.hcl b/cluster/prod/app/garage/deploy/garage.hcl index 7ed963c..0a89a89 100644 --- a/cluster/prod/app/garage/deploy/garage.hcl +++ b/cluster/prod/app/garage/deploy/garage.hcl @@ -1,5 +1,5 @@ job "garage" { - datacenters = [ "neptune", "bespin", "orion", "scorpio" ] + datacenters = [ "neptune", "bespin", "scorpio" ] type = "system" priority = 80 diff --git a/cluster/prod/app/guichet/deploy/directory.hcl b/cluster/prod/app/guichet/deploy/directory.hcl index a64b7e6..86437b9 100644 --- a/cluster/prod/app/guichet/deploy/directory.hcl +++ b/cluster/prod/app/guichet/deploy/directory.hcl @@ -1,5 +1,5 @@ job "guichet" { - datacenters = [ "neptune", "orion" ] + datacenters = [ "neptune", "scorpio" ] type = "service" priority = 90 diff --git a/cluster/prod/app/matrix/deploy/im.hcl b/cluster/prod/app/matrix/deploy/im.hcl index 927f04f..e373da4 100644 --- a/cluster/prod/app/matrix/deploy/im.hcl +++ b/cluster/prod/app/matrix/deploy/im.hcl @@ -1,5 +1,5 @@ job "matrix" { - datacenters = ["orion", "neptune"] + datacenters = ["scorpio", "neptune"] type = "service" priority = 40 diff --git a/cluster/prod/app/plume/deploy/plume.hcl b/cluster/prod/app/plume/deploy/plume.hcl index c266167..5d10339 100644 --- a/cluster/prod/app/plume/deploy/plume.hcl +++ b/cluster/prod/app/plume/deploy/plume.hcl @@ -1,5 +1,5 @@ job "plume-blog" { - datacenters = ["orion", "neptune"] + datacenters = ["scorpio", "neptune"] type = "service" group "plume" { diff --git a/cluster/prod/app/postgres/deploy/postgres.hcl b/cluster/prod/app/postgres/deploy/postgres.hcl index 948387e..a42d57e 100644 --- a/cluster/prod/app/postgres/deploy/postgres.hcl +++ b/cluster/prod/app/postgres/deploy/postgres.hcl @@ -1,5 +1,5 @@ job "postgres14" { - datacenters = ["orion", "neptune", "bespin", "scorpio"] + datacenters = ["neptune", "bespin", "scorpio"] type = "system" priority = 90 @@ -19,8 +19,8 @@ job "postgres14" { constraint { attribute = "${attr.unique.hostname}" operator = "set_contains_any" - # target: courgette,df-ymf,abricot (or ananas) - value = "diplotaxis,courgette,df-ymf,abricot" + value = "courgette,df-ymf,abricot" + # old (orion) = diplotaxis } restart { diff --git a/cluster/prod/app/telemetry/deploy/telemetry-service.hcl b/cluster/prod/app/telemetry/deploy/telemetry-service.hcl index 1f55369..c6c5dbf 100644 --- a/cluster/prod/app/telemetry/deploy/telemetry-service.hcl +++ b/cluster/prod/app/telemetry/deploy/telemetry-service.hcl @@ -1,5 +1,5 @@ job "telemetry-service" { - datacenters = ["neptune", "orion"] + datacenters = ["neptune", "scorpio"] type = "service" group "grafana" { diff --git a/cluster/prod/app/telemetry/deploy/telemetry-system.hcl b/cluster/prod/app/telemetry/deploy/telemetry-system.hcl index 9dd17a2..2bbc968 100644 --- a/cluster/prod/app/telemetry/deploy/telemetry-system.hcl +++ b/cluster/prod/app/telemetry/deploy/telemetry-system.hcl @@ -1,5 +1,5 @@ job "telemetry-system" { - datacenters = ["neptune", "orion", "bespin"] + datacenters = ["neptune", "scorpio", "bespin"] type = "system" priority = "100" -- cgit v1.2.3