Skip to content
Snippets Groups Projects
Commit f849b38f authored by František Dvořák's avatar František Dvořák
Browse files

Volume attachments not supported @ PSNC production

parent 8493ff38
No related branches found
No related tags found
No related merge requests found
...@@ -109,10 +109,11 @@ resource "openstack_blockstorage_volume_v3" "nfs-volume" { ...@@ -109,10 +109,11 @@ resource "openstack_blockstorage_volume_v3" "nfs-volume" {
size = var.nfs_volume_size size = var.nfs_volume_size
} }
resource "openstack_compute_volume_attach_v2" "nfs-volume-attach" { # Multiattach volumes are only supported starting with compute API version 2.60.
instance_id = openstack_compute_instance_v2.nfs.id # resource "openstack_compute_volume_attach_v2" "nfs-volume-attach" {
volume_id = openstack_blockstorage_volume_v3.nfs-volume.id # instance_id = openstack_compute_instance_v2.nfs.id
} # volume_id = openstack_blockstorage_volume_v3.nfs-volume.id
# }
resource "local_file" "volume-script" { resource "local_file" "volume-script" {
filename = "nfs-volume.sh" filename = "nfs-volume.sh"
...@@ -123,7 +124,7 @@ if ! dpkg-query -s xfsprogs >/dev/null 2>&1; then ...@@ -123,7 +124,7 @@ if ! dpkg-query -s xfsprogs >/dev/null 2>&1; then
apt-get update apt-get update
apt-get install -y xfsprogs apt-get install -y xfsprogs
fi 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 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 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 mkdir /exports 2>/dev/null || true
...@@ -137,18 +138,19 @@ resource "openstack_blockstorage_volume_v3" "docker-volume" { ...@@ -137,18 +138,19 @@ resource "openstack_blockstorage_volume_v3" "docker-volume" {
size = var.docker_volumes_size size = var.docker_volumes_size
} }
resource "openstack_compute_volume_attach_v2" "docker-volume-attach" { # Multiattach volumes are only supported starting with compute API version 2.60.
count = var.extra_workers + var.gpu_workers + 2 # resource "openstack_compute_volume_attach_v2" "docker-volume-attach" {
instance_id = local.nodes[count.index].id # count = var.extra_workers + var.gpu_workers + 2
volume_id = openstack_blockstorage_volume_v3.docker-volume[count.index].id # instance_id = local.nodes[count.index].id
} # volume_id = openstack_blockstorage_volume_v3.docker-volume[count.index].id
# }
resource "local_file" "docker-volume-script" { resource "local_file" "docker-volume-script" {
filename = "docker-volume.sh" filename = "docker-volume.sh"
file_permission = "0755" file_permission = "0755"
content = <<EOT content = <<EOT
#! /bin/bash -xe #! /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):") volume=$(echo "$volumes" | grep "$(hostname):")
device=$(echo "$volume" | cut -d: -f2) device=$(echo "$volume" | cut -d: -f2)
if ! dumpe2fs -h "$device" >/dev/null 2>&1; then if ! dumpe2fs -h "$device" >/dev/null 2>&1; then
...@@ -173,17 +175,18 @@ resource "openstack_blockstorage_volume_v3" "squid-volume" { ...@@ -173,17 +175,18 @@ resource "openstack_blockstorage_volume_v3" "squid-volume" {
size = var.squid_volume_size size = var.squid_volume_size
} }
resource "openstack_compute_volume_attach_v2" "squid-volume-attach" { # Multiattach volumes are only supported starting with compute API version 2.60.
instance_id = openstack_compute_instance_v2.ingress.id # resource "openstack_compute_volume_attach_v2" "squid-volume-attach" {
volume_id = openstack_blockstorage_volume_v3.squid-volume.id # instance_id = openstack_compute_instance_v2.ingress.id
} # volume_id = openstack_blockstorage_volume_v3.squid-volume.id
# }
resource "local_file" "squid-volume-script" { resource "local_file" "squid-volume-script" {
filename = "squid-volume.sh" filename = "squid-volume.sh"
file_permission = "0755" file_permission = "0755"
content = <<EOT content = <<EOT
#! /bin/bash -xe #! /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 if ! dumpe2fs -h "$device" >/dev/null 2>&1; then
mkfs.ext4 -L SQUID "$device" mkfs.ext4 -L SQUID "$device"
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment