From f849b38f2dfeba84eb1a6eb141facf4ef5808709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz> Date: Wed, 18 Sep 2024 13:45:34 +0000 Subject: [PATCH] Volume attachments not supported @ PSNC production --- production1/terraform/vms.tf | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/production1/terraform/vms.tf b/production1/terraform/vms.tf index 3b875ec..c170ede 100644 --- a/production1/terraform/vms.tf +++ b/production1/terraform/vms.tf @@ -109,10 +109,11 @@ resource "openstack_blockstorage_volume_v3" "nfs-volume" { size = var.nfs_volume_size } -resource "openstack_compute_volume_attach_v2" "nfs-volume-attach" { - instance_id = openstack_compute_instance_v2.nfs.id - volume_id = openstack_blockstorage_volume_v3.nfs-volume.id -} +# Multiattach volumes are only supported starting with compute API version 2.60. +# resource "openstack_compute_volume_attach_v2" "nfs-volume-attach" { +# instance_id = openstack_compute_instance_v2.nfs.id +# volume_id = openstack_blockstorage_volume_v3.nfs-volume.id +# } resource "local_file" "volume-script" { filename = "nfs-volume.sh" @@ -123,7 +124,7 @@ if ! dpkg-query -s xfsprogs >/dev/null 2>&1; then apt-get update apt-get install -y xfsprogs fi -device="${openstack_compute_volume_attach_v2.nfs-volume-attach.device}" +device="/dev/sdc" # openstack_compute_volume_attach_v2.nfs-volume-attach.device mkfs.xfs -L NFS "$device" || true grep -q 'LABEL=NFS' /etc/fstab || /bin/echo -e "LABEL=NFS\t/exports\txfs\tdefaults,uquota,pquota\t0\t0" | tee -a /etc/fstab mkdir /exports 2>/dev/null || true @@ -137,18 +138,19 @@ resource "openstack_blockstorage_volume_v3" "docker-volume" { size = var.docker_volumes_size } -resource "openstack_compute_volume_attach_v2" "docker-volume-attach" { - count = var.extra_workers + var.gpu_workers + 2 - instance_id = local.nodes[count.index].id - volume_id = openstack_blockstorage_volume_v3.docker-volume[count.index].id -} +# Multiattach volumes are only supported starting with compute API version 2.60. +# resource "openstack_compute_volume_attach_v2" "docker-volume-attach" { +# count = var.extra_workers + var.gpu_workers + 2 +# instance_id = local.nodes[count.index].id +# volume_id = openstack_blockstorage_volume_v3.docker-volume[count.index].id +# } resource "local_file" "docker-volume-script" { filename = "docker-volume.sh" file_permission = "0755" content = <<EOT #! /bin/bash -xe -volumes="${join("\n", [for n, d in zipmap(tolist(local.nodes[*].name), tolist(openstack_compute_volume_attach_v2.docker-volume-attach[*].device)) : format("%s:%s", n, d)])}" +volumes="${join("\n", [for n in tolist(local.nodes[*].name) : format("%s:%s", n, "/dev/sdb")])}" volume=$(echo "$volumes" | grep "$(hostname):") device=$(echo "$volume" | cut -d: -f2) if ! dumpe2fs -h "$device" >/dev/null 2>&1; then @@ -173,17 +175,18 @@ resource "openstack_blockstorage_volume_v3" "squid-volume" { size = var.squid_volume_size } -resource "openstack_compute_volume_attach_v2" "squid-volume-attach" { - instance_id = openstack_compute_instance_v2.ingress.id - volume_id = openstack_blockstorage_volume_v3.squid-volume.id -} +# Multiattach volumes are only supported starting with compute API version 2.60. +# resource "openstack_compute_volume_attach_v2" "squid-volume-attach" { +# instance_id = openstack_compute_instance_v2.ingress.id +# volume_id = openstack_blockstorage_volume_v3.squid-volume.id +# } resource "local_file" "squid-volume-script" { filename = "squid-volume.sh" file_permission = "0755" content = <<EOT #! /bin/bash -xe -device="${openstack_compute_volume_attach_v2.squid-volume-attach.device}" +device="/dev/sdc" # openstack_compute_volume_attach_v2.squid-volume-attach.device if ! dumpe2fs -h "$device" >/dev/null 2>&1; then mkfs.ext4 -L SQUID "$device" fi -- GitLab