Merge pull request #219 from mira-miracoli/migrate-beacon

Move beacon in new cloud
usegalaxy-eu · Dec 3, 2024 · a7e3a9a · a7e3a9a
2 parents 41ec590 + 0ac466d
commit a7e3a9a
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 80 deletions.
diff --git a/instance_dedicated_beacon.tf b/instance_dedicated_beacon.tf
@@ -1,56 +1,55 @@
-# 26.04.2024: Disabled as the instance is still running in the old cloud.
-# data "openstack_images_image_v2" "beacon-image" {
-#   # BW Cloud Rocky 9 basic image
-#   name = "Rocky 9.3"
-# }
+data "openstack_images_image_v2" "beacon-image" {
+  name = "vgcn~rockylinux-9-latest-x86_64~+generic+internal~20240820~42312~HEAD~479ec25"
+  most_recent = true
+}
 
-# resource "openstack_compute_instance_v2" "beacon" {
-#   name            = "beacon.galaxyproject.eu"
-#   image_id        = data.openstack_images_image_v2.beacon-image.id
-#   flavor_name     = "m1.small"
-#   key_pair        = "cloud2"
-#   tags            = []
-#   security_groups = ["default", "public-web2"]
+resource "openstack_compute_instance_v2" "beacon" {
+  name            = "beacon.galaxyproject.eu"
+  image_id        = data.openstack_images_image_v2.beacon-image.id
+  flavor_name     = "m1.small"
+  key_pair        = "cloud2"
+  tags            = []
+  security_groups = ["default", "public-web2"]
 
-#   network {
-#     name = "bioinf"
-#   }
+  network {
+    name = "bioinf"
+  }
 
-#   user_data = <<-EOF
-#     #cloud-config
-#     bootcmd:
-#         - test -z "$(blkid /dev/vdb)" && mkfs -t ext4 /dev/vdb
-#         - mkdir -p /data
-#     mounts:
-#         - ["/dev/vdb", "/data", auto, "defaults,nofail", "0", "2"]
-#     runcmd:
-#         - [ chown, "rocky.rocky", -R, /data ]
-#     package_update: true
-#     package_upgrade: true
-#   EOF
-# }
+  user_data = <<-EOF
+    #cloud-config
+    bootcmd:
+        - test -z "$(blkid /dev/vdb)" && mkfs -t ext4 /dev/vdb
+        - mkdir -p /data
+    mounts:
+        - ["/dev/vdb", "/data", auto, "defaults,nofail", "0", "2"]
+    runcmd:
+        - [ chown, "rocky.rocky", -R, /data ]
+    package_update: true
+    package_upgrade: true
+  EOF
+}
 
-# resource "aws_route53_record" "beacon-galaxyproject" {
-#   allow_overwrite = true
-#   zone_id         = var.zone_galaxyproject_eu
-#   name            = "beacon.galaxyproject.eu"
-#   type            = "A"
-#   ttl             = "600"
-#   records         = ["${openstack_compute_instance_v2.beacon.access_ip_v4}"]
-# }
+resource "aws_route53_record" "beacon-galaxyproject" {
+  allow_overwrite = true
+  zone_id         = var.zone_galaxyproject_eu
+  name            = "beacon.galaxyproject.eu"
+  type            = "A"
+  ttl             = "600"
+  records         = ["${openstack_compute_instance_v2.beacon.access_ip_v4}"]
+}
 
-# resource "random_id" "beacon-volume_name_unique" {
-#   byte_length = 8
-# }
+resource "random_id" "beacon-volume_name_unique" {
+  byte_length = 8
+}
 
-# resource "openstack_blockstorage_volume_v2" "beacon-vol" {
-#   name        = "beacon-data-vol-${random_id.beacon-volume_name_unique.hex}"
-#   volume_type = "default"
-#   description = "Data volume for beacon VM"
-#   size        = 128
-# }
+resource "openstack_blockstorage_volume_v2" "beacon-vol" {
+  name        = "beacon-data-vol-${random_id.beacon-volume_name_unique.hex}"
+  volume_type = "default"
+  description = "Data volume for beacon VM"
+  size        = 128
+}
 
-# resource "openstack_compute_volume_attach_v2" "beacon-va" {
-#   instance_id = openstack_compute_instance_v2.beacon.id
-#   volume_id   = openstack_blockstorage_volume_v2.beacon-vol.id
-# }
+resource "openstack_compute_volume_attach_v2" "beacon-va" {
+  instance_id = openstack_compute_instance_v2.beacon.id
+  volume_id   = openstack_blockstorage_volume_v2.beacon-vol.id
+}
diff --git a/instance_dedicated_beacon_import.tf b/instance_dedicated_beacon_import.tf
@@ -1,36 +1,34 @@
+data "openstack_images_image_v2" "beacon-import-image" {
+  # VGCN Rocky 9.2 generic image
+  name = "vgcn~rockylinux-9-latest-x86_64~+generic+internal~20240820~42312~HEAD~479ec25"
+  most_recent = true
+}
 
-# 26.04.2024: Disabled as the instance is still running in the old cloud.
-# 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"
-#   most_recent = true
-# }
+resource "openstack_compute_instance_v2" "beacon-import" {
+  name            = "beacon-import.galaxyproject.eu"
+  image_id        = data.openstack_images_image_v2.beacon-import-image.id
+  flavor_name     = "m1.tiny"
+  key_pair        = "cloud2"
+  tags            = []
+  security_groups = ["default"]
 
-# resource "openstack_compute_instance_v2" "beacon-import" {
-#   name            = "beacon-import.galaxyproject.eu"
-#   image_id        = data.openstack_images_image_v2.beacon-import-image.id
-#   flavor_name     = "m1.tiny"
-#   key_pair        = "cloud2"
-#   tags            = []
-#   security_groups = ["default"]
+  network {
+    name = "bioinf"
+  }
 
-#   network {
-#     name = "bioinf"
-#   }
+  user_data = <<-EOF
+    #cloud-config
+    package_update: true
+    package_upgrade: true
+  EOF
 
-#   user_data = <<-EOF
-#     #cloud-config
-#     package_update: true
-#     package_upgrade: true
-#   EOF
+}
 
-# }
-
-# resource "aws_route53_record" "beacon-import-galaxyproject" {
-#   allow_overwrite = true
-#   zone_id         = var.zone_galaxyproject_eu
-#   name            = "beacon-import.galaxyproject.eu"
-#   records         = ["${openstack_compute_instance_v2.beacon-import.access_ip_v4}"]
-#   type            = "A"
-#   ttl             = "600"
-# }
+resource "aws_route53_record" "beacon-import-galaxyproject" {
+  allow_overwrite = true
+  zone_id         = var.zone_galaxyproject_eu
+  name            = "beacon-import.galaxyproject.eu"
+  records         = ["${openstack_compute_instance_v2.beacon-import.access_ip_v4}"]
+  type            = "A"
+  ttl             = "600"
+}