diff --git a/.deploy.gitlab-ci.yml b/.deploy.gitlab-ci.yml index a89c64eadd673f6063b737d31e295f4e754e4366..199bd6a775ce8450bb04743c14dfd9fea8475f5e 100644 --- a/.deploy.gitlab-ci.yml +++ b/.deploy.gitlab-ci.yml @@ -29,26 +29,31 @@ deploy_nomad: name: $STATION script: - | + NOMAD_HOSTNAME="monitor.control.lofar" + NOMAD_REGION="lofar-${STATION}" + if [ "${STATION}" == "dts-lab" ]; then # dts-lab test station - HOSTNAME="dts-lab.lofar.net" + NOMAD_HOSTNAME="dts-lab.lofar.net" + NOMAD_REGION="global" EXTRA_VARFILES="-var-file=infra/env/cs.yaml" elif [ "${STATION::2}" == "rs" ]; then # remote station - HOSTNAME="${STATION}c.control.lofar" + HOSTNAME="monitor.control.lofar" + REGION="lofar-${STATION}" EXTRA_VARFILES="-var-file=infra/env/rs.yaml" else # core station - HOSTNAME="${STATION}c.control.lofar" EXTRA_VARFILES="-var-file=infra/env/cs.yaml" fi # To deploy manually, get the env.yaml and the .levant.nomad file, # and run docker run --rm -i --net=host -v /path/to/env.yaml:/env.yaml:ro hashicorp/levant deploy --var-file=/env.yaml /dev/stdin < /path/to/file.levant.nomad levant deploy \ - -address="http://${HOSTNAME}:4646" \ + -address="http://${NOMAD_HOSTNAME}:4646" \ -var-file=infra/env/common.yaml ${EXTRA_VARFILES} \ -var image_tag="${CI_COMMIT_REF_SLUG}" \ + -var region="${NOMAD_REGION}" \ -var station="${STATION}" \ -ignore-no-changes \ infra/jobs/station/${COMPONENT}.levant.nomad diff --git a/infra/jobs/station/device-server.levant.nomad b/infra/jobs/station/device-server.levant.nomad index 9959b62eaa1cb189310663e82bde1b919e8d0b7a..5d4572eba6166a9f5ed5498c5f3680fc2bb61272 100644 --- a/infra/jobs/station/device-server.levant.nomad +++ b/infra/jobs/station/device-server.levant.nomad @@ -1,4 +1,5 @@ job "device-servers" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/dsconfig.levant.nomad b/infra/jobs/station/dsconfig.levant.nomad index 8d39dcd2e2d9b9167d893225b70c4ef4a9318d00..f7cbbcd919dc7fa785e3bc92f9843b71179945ab 100644 --- a/infra/jobs/station/dsconfig.levant.nomad +++ b/infra/jobs/station/dsconfig.levant.nomad @@ -3,6 +3,7 @@ job "dsconfig" { payload = "required" } + region = "[[.region]]" datacenters = ["stat"] type = "batch" diff --git a/infra/jobs/station/ec-sim.levant.nomad b/infra/jobs/station/ec-sim.levant.nomad index 641ccac6c490320b449b0ce7fb75f02a83dec905..0435b8654147ee453336b27b6eb80f9fbbaec2f5 100644 --- a/infra/jobs/station/ec-sim.levant.nomad +++ b/infra/jobs/station/ec-sim.levant.nomad @@ -1,4 +1,5 @@ job "ec-sim" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/jupyter.levant.nomad b/infra/jobs/station/jupyter.levant.nomad index 003c9984d25e41e3aaa2ad6255d55c57001de81b..5213a5b6e223b345674077e371f5b8bc3d2fd701 100644 --- a/infra/jobs/station/jupyter.levant.nomad +++ b/infra/jobs/station/jupyter.levant.nomad @@ -1,4 +1,5 @@ job "jupyter" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/landing-page.levant.nomad b/infra/jobs/station/landing-page.levant.nomad index 1944b344d2ff0ddfd4b1460cedaaa2dd1b840d88..c24885db77f121158fcec532f24cc1c9c5351894 100644 --- a/infra/jobs/station/landing-page.levant.nomad +++ b/infra/jobs/station/landing-page.levant.nomad @@ -1,4 +1,5 @@ job "landing-page" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/logging.levant.nomad b/infra/jobs/station/logging.levant.nomad index 5fc213d1d568749f632c833d076472694a9e7f75..20edff100deec12d48ed922bce24037ee5bc5f18 100644 --- a/infra/jobs/station/logging.levant.nomad +++ b/infra/jobs/station/logging.levant.nomad @@ -1,4 +1,5 @@ job "log-scraping" { + region = "[[.region]]" datacenters = ["stat"] [[ if ne .station "dev" ]] type = "system" diff --git a/infra/jobs/station/mesh-gateway.levant.nomad b/infra/jobs/station/mesh-gateway.levant.nomad index 72dcdf20fbe96a7ba26158157218e50cfcffd391..58c0e52e72b63fdd3ace4b94011c3e27178c5f2d 100644 --- a/infra/jobs/station/mesh-gateway.levant.nomad +++ b/infra/jobs/station/mesh-gateway.levant.nomad @@ -1,4 +1,5 @@ job "mesh-gateway" { + region = "[[.region]]" datacenters = ["stat"] type = "service" group "mesh" { diff --git a/infra/jobs/station/monitoring.levant.nomad b/infra/jobs/station/monitoring.levant.nomad index ef97263356cd39df8381655e305abb3e9273a3b5..607ada18f128b42cd83e4f164467b0f898270889 100644 --- a/infra/jobs/station/monitoring.levant.nomad +++ b/infra/jobs/station/monitoring.levant.nomad @@ -1,4 +1,5 @@ job "monitoring" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/object-storage.levant.nomad b/infra/jobs/station/object-storage.levant.nomad index b7f8f85fe7cdce3aebb7a1e6674dbdf6eda7f586..8d839791e561ba94e652121bb8fb54da6a6b5432 100644 --- a/infra/jobs/station/object-storage.levant.nomad +++ b/infra/jobs/station/object-storage.levant.nomad @@ -1,4 +1,5 @@ job "object-storage" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/rpc-server.levant.nomad b/infra/jobs/station/rpc-server.levant.nomad index 97f92870203d2637fbfddc3f6c9446b6d5d323dd..fe214c070a99bf39d3ae7fc8e1743e06d78a31d2 100644 --- a/infra/jobs/station/rpc-server.levant.nomad +++ b/infra/jobs/station/rpc-server.levant.nomad @@ -1,4 +1,5 @@ job "rpc-server" { + region = "[[.region]]" datacenters = ["stat"] type = "service" reschedule { diff --git a/infra/jobs/station/sdptr.levant.nomad b/infra/jobs/station/sdptr.levant.nomad index 28341708e2222ee7b46e84f2f1a87ba824ceab89..532af359dcea200fae8b2a6dfef0cd9305c25283 100644 --- a/infra/jobs/station/sdptr.levant.nomad +++ b/infra/jobs/station/sdptr.levant.nomad @@ -1,4 +1,5 @@ job "sdptr" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/server-monitoring.levant.nomad b/infra/jobs/station/server-monitoring.levant.nomad index aa5aee3913346cf2b5c994f0164eafabb5946def..a71dcb7b6a216a4688379e575ff8783515fc7e27 100644 --- a/infra/jobs/station/server-monitoring.levant.nomad +++ b/infra/jobs/station/server-monitoring.levant.nomad @@ -1,4 +1,5 @@ job "server-monitoring" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/simulators.levant.nomad b/infra/jobs/station/simulators.levant.nomad index ee0385b974987f5300b3a523f46b5e74ebff673c..c1b606da416df4327dfb19e1e6bfbd8c0cc4df80 100644 --- a/infra/jobs/station/simulators.levant.nomad +++ b/infra/jobs/station/simulators.levant.nomad @@ -1,4 +1,5 @@ job "simulators" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/snmp-exporter.levant.nomad b/infra/jobs/station/snmp-exporter.levant.nomad index e3a58512719d936ac2ab1ded8b38a75cb1777124..ab6588023a3946972a5c405fcf4d71fc1b97d06c 100644 --- a/infra/jobs/station/snmp-exporter.levant.nomad +++ b/infra/jobs/station/snmp-exporter.levant.nomad @@ -1,4 +1,5 @@ job "snmp-exporter" { + region = "[[.region]]" datacenters = ["stat"] type = "service" diff --git a/infra/jobs/station/tango.levant.nomad b/infra/jobs/station/tango.levant.nomad index d68f8a3ccc23de06a472d887bf8d8deae94533ac..3bba681d172afed0f966937feaa05c814af46252 100644 --- a/infra/jobs/station/tango.levant.nomad +++ b/infra/jobs/station/tango.levant.nomad @@ -1,4 +1,5 @@ job "tango" { + region = "[[.region]]" datacenters = ["stat"] type = "service"