Skip to content

Commit

Permalink
Merge pull request #223 from mira-miracoli/silver-until-ips-for-kvm (…
Browse files Browse the repository at this point in the history
…actually bronze, wrong branch name)

Add bronze worker to cloud until we get IP addresses for KVM
  • Loading branch information
mira-miracoli authored Dec 16, 2024
2 parents ef2ef11 + 2738c32 commit 010dcea
Showing 1 changed file with 49 additions and 49 deletions.
98 changes: 49 additions & 49 deletions instance_core_jenkins-worker-bronze.tf
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
# 26.04.2024: Disabled as not needed anymore
# variable "workers-bronze" {
# default = 1
# }
# keep until we migrate this to KVM
variable "workers-bronze" {
default = 1
}

# variable "workers-bronze-volume-size" {
# default = 200
# }
variable "workers-bronze-volume-size" {
default = 200
}

# resource "openstack_compute_instance_v2" "jenkins-workers-bronze" {
# name = "worker-${count.index}.bronze.build.galaxyproject.eu"
# image_name = var.jenkins_image
# flavor_name = "m1.xlarge"
# key_pair = "jenkins2"
# security_groups = ["default"]
# count = var.workers-bronze
resource "openstack_compute_instance_v2" "jenkins-workers-bronze" {
name = "worker-${count.index}.bronze.build.galaxyproject.eu"
image_name = var.jenkins_image
flavor_name = "m1.xlarge"
key_pair = "jenkins2"
security_groups = ["default"]
count = var.workers-bronze

# network {
# name = "bioinf"
# }
network {
name = "bioinf"
}

# user_data = <<-EOF
# #cloud-config
# bootcmd:
# - test -z "$(blkid /dev/vdb)" && mkfs -t ext4 -L jenkins /dev/vdb
# - mkdir -p /scratch
# mounts:
# - ["/dev/vdb", "/scratch", auto, "defaults,nofail", "0", "2"]
# runcmd:
# - [ chown, "centos.centos", -R, /scratch ]
# EOF
# }
user_data = <<-EOF
#cloud-config
bootcmd:
- test -z "$(blkid /dev/vdb)" && mkfs -t ext4 -L jenkins /dev/vdb
- mkdir -p /scratch
mounts:
- ["/dev/vdb", "/scratch", auto, "defaults,nofail", "0", "2"]
runcmd:
- [ chown, "centos.centos", -R, /scratch ]
EOF
}

# resource "openstack_blockstorage_volume_v2" "jenkins-workers-bronze-volume" {
# name = "jenkins-workers-bronze-volume"
# description = "Data volume for Jenkins worker-${count.index}.bronze.build.galaxyproject.eu"
# volume_type = "default"
# size = var.workers-bronze-volume-size
# count = var.workers-bronze
# }
resource "openstack_blockstorage_volume_v2" "jenkins-workers-bronze-volume" {
name = "jenkins-workers-bronze-volume"
description = "Data volume for Jenkins worker-${count.index}.bronze.build.galaxyproject.eu"
volume_type = "default"
size = var.workers-bronze-volume-size
count = var.workers-bronze
}

# resource "openstack_compute_volume_attach_v2" "jenkins-workers-bronze-va" {
# instance_id = element(openstack_compute_instance_v2.jenkins-workers-bronze.*.id, count.index)
# volume_id = element(openstack_blockstorage_volume_v2.jenkins-workers-bronze-volume.*.id, count.index)
# count = var.workers-bronze
# }
resource "openstack_compute_volume_attach_v2" "jenkins-workers-bronze-va" {
instance_id = element(openstack_compute_instance_v2.jenkins-workers-bronze.*.id, count.index)
volume_id = element(openstack_blockstorage_volume_v2.jenkins-workers-bronze-volume.*.id, count.index)
count = var.workers-bronze
}

# resource "aws_route53_record" "jenkins-workers-bronze" {
# allow_overwrite = true
# zone_id = var.zone_galaxyproject_eu
# name = "worker-${count.index}.bronze.build.galaxyproject.eu"
# type = "A"
# ttl = "7200"
# records = ["${element(openstack_compute_instance_v2.jenkins-workers-bronze.*.access_ip_v4, count.index)}"]
# count = var.workers-bronze
# }
resource "aws_route53_record" "jenkins-workers-bronze" {
allow_overwrite = true
zone_id = var.zone_galaxyproject_eu
name = "worker-${count.index}.bronze.build.galaxyproject.eu"
type = "A"
ttl = "7200"
records = ["${element(openstack_compute_instance_v2.jenkins-workers-bronze.*.access_ip_v4, count.index)}"]
count = var.workers-bronze
}

0 comments on commit 010dcea

Please sign in to comment.