From 1c23e350666236044be4996eab43fbd9a468e258 Mon Sep 17 00:00:00 2001 From: mark roberts Date: Wed, 3 Jan 2024 14:47:27 +0000 Subject: [PATCH 1/6] adding missing volume test --- terraform/environments/equip/main.tf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/terraform/environments/equip/main.tf b/terraform/environments/equip/main.tf index 2ecb8e712d7..26fd148b375 100644 --- a/terraform/environments/equip/main.tf +++ b/terraform/environments/equip/main.tf @@ -635,9 +635,7 @@ locals { tags = merge(local.tags, { Name = "${local.name}-COR-A-EQP04-ebs-block-1" } ) - } - ] - ebs_block_device = [ + }, { device_name = "/dev/sdh" volume_type = "gp3" @@ -649,6 +647,7 @@ locals { ) } ] + tags = merge(local.tags, { Name = "${local.name}-COR-A-EQP04" Role = "Nimbus Application Services" } From 351d241b7b615ab399c124048f499c3428310015 Mon Sep 17 00:00:00 2001 From: mark roberts Date: Wed, 3 Jan 2024 14:53:18 +0000 Subject: [PATCH 2/6] changed back --- terraform/environments/equip/main.tf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/terraform/environments/equip/main.tf b/terraform/environments/equip/main.tf index 26fd148b375..71610b8ee34 100644 --- a/terraform/environments/equip/main.tf +++ b/terraform/environments/equip/main.tf @@ -635,7 +635,9 @@ locals { tags = merge(local.tags, { Name = "${local.name}-COR-A-EQP04-ebs-block-1" } ) - }, + } + ] + ebs_block_device = [ { device_name = "/dev/sdh" volume_type = "gp3" From dbee17cacc9f6f4e27bb57984d54b5cb6f63c33e Mon Sep 17 00:00:00 2001 From: mark roberts Date: Wed, 3 Jan 2024 14:55:48 +0000 Subject: [PATCH 3/6] test2 --- terraform/environments/equip/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/environments/equip/main.tf b/terraform/environments/equip/main.tf index 71610b8ee34..68e70a48554 100644 --- a/terraform/environments/equip/main.tf +++ b/terraform/environments/equip/main.tf @@ -637,7 +637,7 @@ locals { ) } ] - ebs_block_device = [ + ebs_block_device2 = [ { device_name = "/dev/sdh" volume_type = "gp3" From fb1777fba075a8b41eac5cd7f5365d8e415ab325 Mon Sep 17 00:00:00 2001 From: mark roberts Date: Wed, 3 Jan 2024 15:02:00 +0000 Subject: [PATCH 4/6] added comma to seperate the two ebs --- terraform/environments/equip/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/environments/equip/main.tf b/terraform/environments/equip/main.tf index 68e70a48554..cd9fd0198a4 100644 --- a/terraform/environments/equip/main.tf +++ b/terraform/environments/equip/main.tf @@ -636,8 +636,8 @@ locals { { Name = "${local.name}-COR-A-EQP04-ebs-block-1" } ) } - ] - ebs_block_device2 = [ + ], + ebs_block_device = [ { device_name = "/dev/sdh" volume_type = "gp3" From 04c9f4af8a76a8d108a9e48e7c01877e71e4a79f Mon Sep 17 00:00:00 2001 From: mark roberts Date: Wed, 3 Jan 2024 15:08:48 +0000 Subject: [PATCH 5/6] changed to for each --- terraform/environments/equip/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/environments/equip/main.tf b/terraform/environments/equip/main.tf index cd9fd0198a4..7c9d23867a7 100644 --- a/terraform/environments/equip/main.tf +++ b/terraform/environments/equip/main.tf @@ -636,7 +636,7 @@ locals { { Name = "${local.name}-COR-A-EQP04-ebs-block-1" } ) } - ], + ] ebs_block_device = [ { device_name = "/dev/sdh" @@ -766,7 +766,7 @@ module "win2022_STD_multiple" { enable_volume_tags = false root_block_device = lookup(each.value, "root_block_device", []) - ebs_block_device = lookup(each.value, "ebs_block_device", []) + ebs_block_device = lookup(for_each.value, "ebs_block_device", []) tags = merge(each.value.tags, local.tags, { Environment = "development" From 3e29976da5cf979630d5b3871e9701c2d8e6f9f5 Mon Sep 17 00:00:00 2001 From: Edward Proctor Date: Wed, 3 Jan 2024 16:15:51 +0000 Subject: [PATCH 6/6] Changed how the volume list is read in --- terraform/environments/equip/main.tf | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/terraform/environments/equip/main.tf b/terraform/environments/equip/main.tf index 7c9d23867a7..3e4104b7fb6 100644 --- a/terraform/environments/equip/main.tf +++ b/terraform/environments/equip/main.tf @@ -635,9 +635,7 @@ locals { tags = merge(local.tags, { Name = "${local.name}-COR-A-EQP04-ebs-block-1" } ) - } - ] - ebs_block_device = [ + }, { device_name = "/dev/sdh" volume_type = "gp3" @@ -680,9 +678,7 @@ locals { tags = merge(local.tags, { Name = "${local.name}-COR-A-EQP05-ebs-block-1" } ) - } - ] - ebs_block_device = [ + }, { device_name = "/dev/sdg" volume_type = "gp3" @@ -724,9 +720,7 @@ locals { tags = merge(local.tags, { Name = "${local.name}-COR-A-EQP06-ebs-block-1" } ) - } - ] - ebs_block_device = [ + }, { device_name = "/dev/sdg" volume_type = "gp3" @@ -766,7 +760,7 @@ module "win2022_STD_multiple" { enable_volume_tags = false root_block_device = lookup(each.value, "root_block_device", []) - ebs_block_device = lookup(for_each.value, "ebs_block_device", []) + ebs_block_device = lookup(each.value, "ebs_block_device", []) tags = merge(each.value.tags, local.tags, { Environment = "development"