Replace list of glob by single glob and add size to volume specs

ComputeCanada · Feb 28, 2024 · 8a47f2b · 8a47f2b
1 parent ac833e6
commit 8a47f2b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/aws/infrastructure.tf b/aws/infrastructure.tf
@@ -200,7 +200,10 @@ locals {
         for pv_key, pv_values in var.volumes:
           pv_key => {
             for name, specs in pv_values:
-              name => ["/dev/disk/by-id/*${replace(aws_ebs_volume.volumes["${x}-${pv_key}-${name}"].id, "-", "")}"]
+              name => {
+                glob = "/dev/disk/by-id/*${replace(aws_ebs_volume.volumes["${x}-${pv_key}-${name}"].id, "-", "")}"
+                size = specs.size
+              }
           } if contains(values.tags, pv_key)
        } : {}
     }

diff --git a/azure/infrastructure.tf b/azure/infrastructure.tf
@@ -163,7 +163,10 @@ locals {
         for pv_key, pv_values in var.volumes:
           pv_key => {
             for name, specs in pv_values:
-              name => ["/dev/disk/azure/scsi1/lun${index(module.design.volume_per_instance[x], replace(pv_key, "${x}-", ""))}"]
+              name => {
+                glob = "/dev/disk/azure/scsi1/lun${index(module.design.volume_per_instance[x], replace(pv_key, "${x}-", ""))}"
+                size = specs.size
+              }
           } if contains(values.tags, pv_key)
        } : {}
     }

diff --git a/gcp/infrastructure.tf b/gcp/infrastructure.tf
@@ -173,7 +173,10 @@ locals {
         for pv_key, pv_values in var.volumes:
           pv_key => {
             for name, specs in pv_values:
-              name => ["/dev/disk/by-id/google-${var.cluster_name}-${x}-${pv_key}-${name}"]
+              name => {
+                glob = "/dev/disk/by-id/google-${var.cluster_name}-${x}-${pv_key}-${name}"
+                size = specs.size
+              }
           } if contains(values.tags, pv_key)
       } : {}
     }

diff --git a/openstack/infrastructure.tf b/openstack/infrastructure.tf
@@ -127,7 +127,10 @@ locals {
         for pv_key, pv_values in var.volumes:
           pv_key => {
             for name, specs in pv_values:
-              name => ["/dev/disk/by-id/*${substr(openstack_blockstorage_volume_v3.volumes["${x}-${pv_key}-${name}"].id, 0, 20)}"]
+              name => {
+                glob = "/dev/disk/by-id/*${substr(openstack_blockstorage_volume_v3.volumes["${x}-${pv_key}-${name}"].id, 0, 20)}"
+                size = specs.size
+              }
           } if contains(values.tags, pv_key)
        } : {}
     }