Move specs to volumes terraform_data

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

Hide file tree

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

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

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

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