rename data to existing_volumes

mboisson · mboisson · commit 78b533094727 · 2025-01-13T16:37:28.000-05:00
diff --git a/openstack/infrastructure.tf b/openstack/infrastructure.tf
@@ -108,7 +108,7 @@ resource "openstack_blockstorage_volume_v3" "volumes" {
   snapshot_id = lookup(each.value, "snapshot", null)
   enable_online_resize = lookup(each.value, "enable_resize", false)
 }
-data "openstack_blockstorage_volume_v3" "volumes" {
+data "openstack_blockstorage_volume_v3" "existing_volumes" {
   for_each    = {
     for x, values in module.design.volumes : x => values if contains(keys(values), "volume_id")
   }
@@ -143,7 +143,7 @@ locals {
           pv_key => {
             for name, specs in pv_values:
               name => merge(
-                { glob = "/dev/disk/by-id/*${substr(openstack_blockstorage_volume_v3.volumes["${x}-${pv_key}-${name}"].id, 0, 20)}" },
+                { glob = try("/dev/disk/by-id/*${substr(openstack_blockstorage_volume_v3.existing_volumes["${x}-${pv_key}-${name}"].id, 0, 20)}", "/dev/disk/by-id/*${substr(openstack_blockstorage_volume_v3.volumes["${x}-${pv_key}-${name}"].id, 0, 20)}") },
                 specs,
               )
           } if contains(values.tags, pv_key)

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ resource "openstack_blockstorage_volume_v3" "volumes" {`
`108`	`108`	`snapshot_id = lookup(each.value, "snapshot", null)`
`109`	`109`	`enable_online_resize = lookup(each.value, "enable_resize", false)`
`110`	`110`	`}`
`111`		`-data "openstack_blockstorage_volume_v3" "volumes" {`
	`111`	`+data "openstack_blockstorage_volume_v3" "existing_volumes" {`
`112`	`112`	`for_each = {`
`113`	`113`	`for x, values in module.design.volumes : x => values if contains(keys(values), "volume_id")`
`114`	`114`	`}`
`@@ -143,7 +143,7 @@ locals {`
`143`	`143`	`pv_key => {`
`144`	`144`	`for name, specs in pv_values:`
`145`	`145`	`name => merge(`
`146`		`- { glob = "/dev/disk/by-id/*${substr(openstack_blockstorage_volume_v3.volumes["${x}-${pv_key}-${name}"].id, 0, 20)}" },`
	`146`	`+ { glob = try("/dev/disk/by-id/${substr(openstack_blockstorage_volume_v3.existing_volumes["${x}-${pv_key}-${name}"].id, 0, 20)}", "/dev/disk/by-id/${substr(openstack_blockstorage_volume_v3.volumes["${x}-${pv_key}-${name}"].id, 0, 20)}") },`
`147`	`147`	`specs,`
`148`	`148`	`)`
`149`	`149`	`} if contains(values.tags, pv_key)`