Merge branch 'main' into eirene

usegalaxy-eu · Jan 30, 2024 · 5092907 · 5092907
2 parents 0c409f2 + 89689f8
commit 5092907
Show file tree

Hide file tree

Showing 5 changed files with 27,981 additions and 27,709 deletions.
diff --git a/README.md b/README.md
@@ -103,3 +103,4 @@ All infra IPs (without going to openstack.)
 ```console
 $ ./bin/tfinfo-to-json.sh | jq -r '.openstack_compute_instance_v2 | keys[] as $k | [$k, .[$k]."network.0.fixed_ip_v4"] | @tsv'
 ```
+
diff --git a/dns.tf b/dns.tf
@@ -258,7 +258,6 @@ variable "it-subdomain" {
     "humancellatlas.usegalaxy.eu",
     "imaging.usegalaxy.eu",
     "usegalaxy.eu",
-    "test.internal.usegalaxy.eu",
     "live.usegalaxy.eu",
     "metabolomics.usegalaxy.eu",
     "metagenomics.usegalaxy.eu",
@@ -277,7 +276,7 @@ variable "it-subdomain" {
 resource "aws_route53_record" "it-subdomain-main" {
   allow_overwrite = true
   zone_id         = var.zone_usegalaxy_eu
-  count           = 27
+  count           = 26
   name            = "*.interactivetoolentrypoint.interactivetool.${element(var.it-subdomain, count.index)}"
   type            = "CNAME"
   ttl             = "7200"

diff --git a/instance_dedicated_beacon_import.tf b/instance_dedicated_beacon_import.tf
@@ -1,6 +1,7 @@
 data "openstack_images_image_v2" "beacon-import-image" {
   # VGCN Rocky 9.2 generic image
-  name = "vgcn~rockylinux-9-latest-x86_64~+generic+internal~20240123~55931~HEAD~5b66040"
+  name        = "vgcn~rockylinux-9-latest-x86_64~+generic+internal~20240123~55931~HEAD~5b66040"
+  most_recent = true
 }
 
 resource "openstack_compute_instance_v2" "beacon-import" {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -103,3 +103,4 @@ All infra IPs (without going to openstack.)
		```console
		$ ./bin/tfinfo-to-json.sh \| jq -r '.openstack_compute_instance_v2 \| keys[] as $k \| [$k, .[$k]."network.0.fixed_ip_v4"] \| @tsv'
		```